Fix dependency issues when included in NRN. (BlueBrain#1243)

In NRN we depend on the target `nmodl` to ensure that when we run `nrnivmodl -coreneuron` the binary `nmodl` exists. We need to also ensure that everything `nmodl` needs to works is present. This fixes a dependency bug on certain copied files by making the target for copying the files a dependency of `nmodl`.
SupportTeam-SC-demos · Apr 18, 2024 · b78c3f3 · b78c3f3
1 parent bb5355f
commit b78c3f3
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/cmake/hpc-coding-conventions b/cmake/hpc-coding-conventions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -34,6 +34,7 @@ target_link_libraries(
   util
   lexer
   ${NMODL_WRAPPER_LIBS})
+add_dependencies(nmodl nmodl_copy_python_files nmodl_copy_solver_files)
 cpp_cc_configure_sanitizers(TARGET nmodl)
 
 # =============================================================================

diff --git a/src/pybind/CMakeLists.txt b/src/pybind/CMakeLists.txt
@@ -76,7 +76,9 @@ file(
 foreach(file IN LISTS NMODL_PYTHON_FILES)
   cpp_cc_build_time_copy(INPUT ${NMODL_PROJECT_SOURCE_DIR}/python/nmodl/${file} OUTPUT
                          ${CMAKE_BINARY_DIR}/lib/nmodl/${file})
+  list(APPEND nmodl_python_binary_dir_files "${CMAKE_BINARY_DIR}/lib/nmodl/${file}")
 endforeach()
+add_custom_target(nmodl_copy_python_files ALL DEPENDS ${nmodl_python_binary_dir_files})
 file(COPY ${NMODL_PROJECT_SOURCE_DIR}/python/nmodl/ext DESTINATION ${CMAKE_BINARY_DIR}/lib/nmodl/)
 
 # =============================================================================

diff --git a/src/solver/CMakeLists.txt b/src/solver/CMakeLists.txt
@@ -8,6 +8,10 @@ cpp_cc_build_time_copy(INPUT "${CMAKE_CURRENT_SOURCE_DIR}/newton/newton.hpp" OUT
 cpp_cc_build_time_copy(INPUT "${CMAKE_CURRENT_SOURCE_DIR}/crout/crout.hpp" OUTPUT
                        "${CMAKE_BINARY_DIR}/include/crout/crout.hpp")
 
+add_custom_target(
+  nmodl_copy_solver_files ALL DEPENDS "${CMAKE_BINARY_DIR}/include/newton/newton.hpp"
+                                      "${CMAKE_BINARY_DIR}/include/crout/crout.hpp")
+
 # Eigen
 file(COPY ${NMODL_PROJECT_SOURCE_DIR}/ext/eigen/Eigen DESTINATION ${CMAKE_BINARY_DIR}/include/)
+1 −1		.bbp-project.yaml
+1 −1		cpp/clang-format-13
+1 −1		cpp/clang-format-14
+108 −0		cpp/clang-format-15
+2 −1		cpp/cmake/build-time-copy.cmake
+33 −12		cpp/cmake/sanitizers.cmake
+32 −4		cpp/formatting/README.md
+1 −1		cpp/formatting/formatting.py
+2 −2		cpp/formatting/snippets/BreakBeforeConceptDeclarations.cpp
+1 −1		cpp/formatting/snippets/IndentRequires.cpp
+23 −0		cpp/formatting/snippets/RequiresClausePosition.cpp
+1 −1		cpp/lib.py