max/poet
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/poet.git synced 2025-12-16 04:48:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

substitute add_defintions by target_compile_defintions

Browse Source
This commit is contained in:
Max Lübke 2021-01-25 17:51:32 +01:00
parent 3482977f6c
commit 9181003fa0
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -9,8 +9,8 @@ set(CMAKE_CXX_STANDARD_REQUIRED True)
list(APPEND CMAKE_MODULE_PATH "${POET_SOURCE_DIR}/CMake")
set(GCC_CXX_FLAGS "-D STRICT_R_HEADERS")
add_definitions(${GCC_CXX_FLAGS})
# set(GCC_CXX_FLAGS "-D STRICT_R_HEADERS")
# add_definitions(${GCC_CXX_FLAGS})
find_package(MPI REQUIRED)

1
src/DHT/CMakeLists.txt
View File

@ -1,6 +1,7 @@
add_library(DHT SHARED DHT.c DHT.h)
target_include_directories(DHT PRIVATE ${MPI_C_INCLUDE_DIRS})
target_link_libraries(DHT MPI::MPI_C)
target_compile_definitions(DHT PUBLIC OMPI_SKIP_MPICXX)
add_library(DHT_Wrapper STATIC DHT_Wrapper.cpp DHT_Wrapper.h)
target_include_directories(DHT_Wrapper PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})

5
src/model/CMakeLists.txt
View File

@ -1,3 +1,4 @@
add_library(POET_Model STATIC ChemSim.cpp ChemSim.h ChemMaster.cpp ChemWorker.cpp TransportSim.cpp Grid.cpp)
target_include_directories(POET_Model PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries(POET_Model POET_Util DHT_Wrapper)
target_include_directories(POET_Model PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} PRIVATE ${MPI_C_INCLUDE_DIRS})
target_link_libraries(POET_Model POET_Util DHT_Wrapper MPI::MPI_C)
target_compile_definitions(POET_Model PUBLIC OMPI_SKIP_MPICXX)

3
src/util/CMakeLists.txt
View File

@ -1,3 +1,4 @@
add_library(POET_Util STATIC RRuntime.cpp Parser.cpp)
target_include_directories(POET_Util PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${R_INCLUDE_DIRS})
target_link_libraries(POET_Util ${R_LIBRARIES})
target_link_libraries(POET_Util ${R_LIBRARIES})
target_compile_definitions(POET_Util PUBLIC STRICT_R_HEADERS)