Commit 58e4ebd3 authored by Martin Beseda's avatar Martin Beseda
Browse files

[ENH] [FIX] Improved compilation and added missing things for Fortran API.

parent 0588a1ba
......@@ -93,6 +93,9 @@ IF("${BUILD_LIB}" STREQUAL "yes")
${LIB_TYPE}
Network/ACSFFitCumulativeAPI.cpp
Network/ACSFFITCumulativeAPI_CAPI.cpp
Network/ACSFFitCumulativeAPI_FAPI.f90
Neuron/Neuron.cpp
Neuron/NeuronBiased.cpp
Neuron/NeuronBinary.cpp
......@@ -137,7 +140,16 @@ IF("${BUILD_LIB}" STREQUAL "yes")
Reader/Reader.cpp
Coordinates/coordinates.cpp
SymmetryFunction/ACSFParametersOptimizer.cpp
mpi_wrapper.cpp
MPIWrapper/mpi_wrapper.cpp
MPIWrapper/mpi_setter.cpp
MPIWrapper/MPIHandler_FAPI.f90
)
TARGET_COMPILE_OPTIONS(
lib4neuro
PUBLIC
-cpp
)
# GFortran linking
......@@ -176,6 +188,7 @@ IF("${BUILD_LIB}" STREQUAL "yes")
${ROOT_DIR}/include
${MPI_C_INCLUDE_DIRS}
${MPI_CXX_INCLUDE_DIRS} # TODO make PRIVATE, if possible!
${PROJECT_BINARY_DIR}/include
PRIVATE
${EXPRTK_INCLUDE_DIR}
......@@ -190,6 +203,7 @@ IF("${BUILD_LIB}" STREQUAL "yes")
ARCHIVE_OUTPUT_DIRECTORY $<1:${LIBRARIES_OUTPUT_DIR}>
LIBRARY_OUTPUT_DIRECTORY $<1:${LIBRARIES_OUTPUT_DIR}>
RUNTIME_OUTPUT_DIRECTORY $<1:${LIBRARIES_OUTPUT_DIR}>
Fortran_MODULE_DIRECTORY ${PROJECT_BINARY_DIR}/include
)
IF("${DEPENDENCIES_LINK_TYPE}" STREQUAL "static")
......
......@@ -30,10 +30,17 @@ TARGET_LINK_LIBRARIES(arma_test
lib4neuro
armadillo::armadillo)
ADD_EXECUTABLE(acsf_fapi acsf_FAPI.f90)
TARGET_LINK_LIBRARIES(acsf_fapi
PUBLIC
lib4neuro)
SET_TARGET_PROPERTIES(
dev_sandbox
seminar
arma_test
acsf_fapi
PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY $<1:${SANDBOX_OUTPUT_DIR}>
......@@ -42,6 +49,13 @@ SET_TARGET_PROPERTIES(
INCLUDE_DIRECTORIES ${ROOT_DIR}/include
)
#TARGET_COMPILE_OPTIONS(
# acsf_fapi
#
# PUBLIC
# -cpp
#)
# Linux only sandbox
IF(NOT WIN32)
message("building petsc_test")
......@@ -62,6 +76,5 @@ IF(NOT WIN32)
PUBLIC
lib4neuro
armadillo::armadillo
${PETSC_TARGET}
)
ENDIF()
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment