Skip to content

Commit a453d3a

Browse files
authored
CMake - clubbing all include directories into one variable (#1166)
this CMake PR adds a cosmetic change to CMakeLists that is necessary when including Microphysics as a submodule in an external code. I clubbed all the include directories into one variable and defined it in the parent scope.
1 parent 6e65f17 commit a453d3a

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

CMakeLists.txt

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,23 @@ else()
9292
endif()
9393

9494
#setting .cpp files needed to make the test here
95-
#so that they are accessible to Quokka
95+
#so that they are accessible to codes using
96+
#Microphysics as a submodule
9697
set(primordial_chem_sources ${CMAKE_CURRENT_SOURCE_DIR}/interfaces/eos_data.cpp
9798
${CMAKE_CURRENT_SOURCE_DIR}/interfaces/network_initialization.cpp
9899
${CMAKE_CURRENT_SOURCE_DIR}/EOS/primordial_chem/actual_eos_data.cpp
99100
${CMAKE_BINARY_DIR}/extern_parameters.cpp)
100101

102+
103+
#setting directories needed to make the test here
104+
#so that they are accessible to codes using
105+
#Microphysics as a submodule
106+
set (primordial_chem_dirs ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/util ${CMAKE_CURRENT_SOURCE_DIR}/util/gcem/include ${CMAKE_CURRENT_SOURCE_DIR}/integration/VODE
107+
${CMAKE_CURRENT_SOURCE_DIR}/integration/utils ${CMAKE_CURRENT_SOURCE_DIR}/integration
108+
${CMAKE_CURRENT_SOURCE_DIR}/EOS ${CMAKE_CURRENT_SOURCE_DIR}/EOS/primordial_chem ${CMAKE_CURRENT_SOURCE_DIR}/networks/primordial_chem ${CMAKE_CURRENT_SOURCE_DIR}/networks ${CMAKE_CURRENT_SOURCE_DIR}/interfaces
109+
${CMAKE_CURRENT_SOURCE_DIR}/constants ${CMAKE_CURRENT_SOURCE_DIR}/networks/general_null)
110+
111+
101112
#set a cache variable that controls whether
102113
#we want to build the unit test or not
103114
set(BUILD_UNIT_TEST false CACHE BOOL "Do you want to build the unit test? (true/false)")

unit_test/CMakeLists.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
#include these directories based on the output of the traditional make
2-
include_directories(${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../util ${CMAKE_CURRENT_SOURCE_DIR}/../util/gcem/include ${CMAKE_CURRENT_SOURCE_DIR}/../integration/VODE ${CMAKE_CURRENT_SOURCE_DIR}/../integration/utils ${CMAKE_CURRENT_SOURCE_DIR}/../integration
3-
${CMAKE_CURRENT_SOURCE_DIR}/../EOS ${CMAKE_CURRENT_SOURCE_DIR}/../EOS/primordial_chem ${CMAKE_CURRENT_SOURCE_DIR}/../networks/primordial_chem ${CMAKE_CURRENT_SOURCE_DIR}/../networks ${CMAKE_CURRENT_SOURCE_DIR}/../interfaces
4-
${CMAKE_CURRENT_SOURCE_DIR}/../constants ${CMAKE_CURRENT_SOURCE_DIR}/../networks/general_null)
5-
2+
include_directories(${primordial_chem_dirs})
63

74
#add primordial_chem test
85
add_subdirectory(burn_cell_primordial_chem)

0 commit comments

Comments
 (0)