From 5e6acc3db789532a7c02ff48db20fac31ed30efd Mon Sep 17 00:00:00 2001 From: Isaac Morales Date: Sat, 28 Sep 2024 12:03:13 +0200 Subject: [PATCH] Changed some variables --- cmake/BioDynaMo.cmake | 5 +++-- demo/soma_clustering/src/soma_clustering.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cmake/BioDynaMo.cmake b/cmake/BioDynaMo.cmake index 47ceade8d..6f91b0469 100644 --- a/cmake/BioDynaMo.cmake +++ b/cmake/BioDynaMo.cmake @@ -111,7 +111,6 @@ function(build_shared_library TARGET) # generate dictionary using rootcling reflex set(DICT_FILE "${CMAKE_CURRENT_BINARY_DIR}/lib${TARGET}_dict") set(BDM_DICT_FILE "${CMAKE_CURRENT_BINARY_DIR}/lib${TARGET}_bdm_dict.cc") - set(module "${TARGET}") set(ROOT_HEADERS) string(REPLACE "${CMAKE_SOURCE_DIR}/src/" "" ROOT_HEADERS_TEMP "${ARG_HEADERS}") string(REPLACE "${CMAKE_SOURCE_DIR}/test/" "" ROOT_HEADERS "${ROOT_HEADERS_TEMP}") @@ -119,6 +118,8 @@ function(build_shared_library TARGET) if (runtime_cxxmodules) set(MODULEMAP "--moduleMapFile=${CMAKE_BINARY_DIR}/include/module.modulemap") + else() + set(NO_MODULE "NO_CXXMODULE") endif() if (NOT ${TARGET} STREQUAL "biodynamo") @@ -133,7 +134,7 @@ function(build_shared_library TARGET) if(NOT DEFINED BDM_CMAKE_DIR) set(BDM_CMAKE_DIR $ENV{BDMSYS}/share/cmake) endif() - ROOT_GENERATE_DICTIONARY(${DICT_FILE} ${ROOT_HEADERS} MODULE ${module} LINKDEF ${BDM_CMAKE_DIR}/${ARG_SELECTION} REFLEX ${NO_MODULE} OPTIONS ${DEPENDENCY_OPTION} -I src --inlineInputHeader --noIncludePaths ${MODULEMAP}) + ROOT_GENERATE_DICTIONARY(${DICT_FILE} ${ROOT_HEADERS} MODULE ${TARGET} LINKDEF ${BDM_CMAKE_DIR}/${ARG_SELECTION} REFLEX ${NO_MODULE} OPTIONS ${DEPENDENCY_OPTION} -I src --inlineInputHeader --noIncludePaths ${MODULEMAP}) if (BDM_OUT_OF_SOURCE) set(BDM_DICT_BIN_PATH "$ENV{BDMSYS}/bin") else() diff --git a/demo/soma_clustering/src/soma_clustering.h b/demo/soma_clustering/src/soma_clustering.h index eaa4a41c4..0f10f652e 100644 --- a/demo/soma_clustering/src/soma_clustering.h +++ b/demo/soma_clustering/src/soma_clustering.h @@ -93,7 +93,7 @@ inline int Simulate(int argc, const char** argv) { num_cells / 2, construct); // Run simulation for N timesteps - const uint64_t timesteps = 30000; + const uint64_t timesteps = 1000; if (timesteps < 6000) { Log::Warning("SomaClustering", "We recommend to run the simulation for roughly 6000 time "