Testing 2

BioDynaMo · Aug 5, 2024 · b0df2a7 · b0df2a7
1 parent 7fa5159
commit b0df2a7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/cmake/BioDynaMo.cmake b/cmake/BioDynaMo.cmake
@@ -110,6 +110,7 @@ function(build_shared_library TARGET)
   if(dict OR DEFINED ARG_PLUGIN)
     # generate dictionary using rootcling reflex
     set(DICT_FILE "${CMAKE_CURRENT_BINARY_DIR}/lib${TARGET}_dict")
+    set(module "${CMAKE_CURRENT_BINARY_DIR}/lib${TARGET}")
     set(BDM_DICT_FILE "${CMAKE_CURRENT_BINARY_DIR}/lib${TARGET}_bdm_dict.cc")
 
     # Since the location of the CMake files differ in the build and installation
@@ -118,7 +119,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} ${ARG_HEADERS} LINKDEF ${BDM_CMAKE_DIR}/${ARG_SELECTION} REFLEX)
+    ROOT_GENERATE_DICTIONARY(${DICT_FILE} ${ARG_HEADERS} MODULE ${module} LINKDEF ${BDM_CMAKE_DIR}/${ARG_SELECTION} REFLEX)
     if (BDM_OUT_OF_SOURCE)
       set(BDM_DICT_BIN_PATH "$ENV{BDMSYS}/bin")
     else()

diff --git a/cmake/RootMacros.cmake b/cmake/RootMacros.cmake
@@ -683,8 +683,8 @@ function(ROOT_GENERATE_DICTIONARY dictionary)
   endforeach()
 
   #---call rootcint------------------------------------------
-  add_custom_command(OUTPUT ${dictionary}.cxx ${pcm_name} ${rootmap_name} ${cpp_module_file}
-                     COMMAND ${command} -v2 -f  ${dictionary}.cxx ${newargs} ${excludepathsargs} ${rootmapargs}
+  add_custom_command(OUTPUT ${dictionary}.cc ${pcm_name} ${rootmap_name} ${cpp_module_file}
+                     COMMAND ${ROOTCLING_EXECUTABLE} -v2 -f  ${dictionary}.cxx ${newargs} ${excludepathsargs} ${rootmapargs}
                                         ${ARG_OPTIONS}
                                         ${definitions} "$<$<BOOL:${module_defs}>:-D$<JOIN:${module_defs},;-D>>"
                                         ${compIncPaths}