This repository was archived by the owner on Mar 20, 2023. It is now read-only.
File tree Expand file tree Collapse file tree 5 files changed +10
-26
lines changed
Expand file tree Collapse file tree 5 files changed +10
-26
lines changed Original file line number Diff line number Diff line change @@ -43,6 +43,7 @@ list(APPEND CMAKE_MODULE_PATH ${CORENEURON_PROJECT_SOURCE_DIR}/CMake
4343# HPC Coding Conventions
4444# =============================================================================
4545set (CODING_CONV_PREFIX "CORENRN" )
46+ set (CORENRN_3RDPARTY_DIR "external" )
4647set (CORENRN_ClangFormat_EXCLUDES_RE
4748 ".*/external/.*$$"
4849 CACHE STRING "list of regular expressions to exclude C/C++ files from formatting" FORCE)
@@ -94,10 +95,6 @@ set(LIKWID_DIR
9495 ""
9596 CACHE PATH "Path to likwid performance analysis suite" )
9697
97- if (CORENEURON_AS_SUBPROJECT)
98- set (CORENRN_ENABLE_UNIT_TESTS OFF )
99- endif ()
100-
10198# =============================================================================
10299# Project version from git and project directories
103100# =============================================================================
Original file line number Diff line number Diff line change 33#
44# See top-level LICENSE file for details.
55# =============================================================================
6-
76include_directories (${CMAKE_SOURCE_DIR} /coreneuron ${Boost_INCLUDE_DIRS} )
8- file (GLOB alignment_test_src "*.cpp" )
97
10- add_executable (alignment_test_bin ${alignment_test_src} )
8+ add_executable (alignment_test_bin alignment.cpp )
119target_link_libraries (alignment_test_bin ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY} )
1210
1311if (CORENRN_ENABLE_GPU)
1412 target_link_libraries (alignment_test_bin ${link_cudacoreneuron} ${CUDA_LIBRARIES} )
1513endif ()
1614
17- add_test (NAME alignment_test COMMAND ${TEST_EXEC_PREFIX}
18- ${CMAKE_CURRENT_BINARY_DIR} /alignment_test_bin)
15+ add_test (NAME alignment_test COMMAND ${TEST_EXEC_PREFIX} $<TARGET_FILE:alignment_test_bin>)
Original file line number Diff line number Diff line change 33#
44# See top-level LICENSE file for details.
55# =============================================================================
6-
7- file (GLOB cmd_interface_test_src "*.cpp" )
8-
9- add_executable (cmd_interface_test_bin ${cmd_interface_test_src} )
6+ add_executable (cmd_interface_test_bin test_cmdline_interface.cpp)
107target_link_libraries (
118 cmd_interface_test_bin
129 ${MPI_CXX_LIBRARIES}
@@ -19,5 +16,4 @@ target_include_directories(cmd_interface_test_bin SYSTEM
1916 PRIVATE ${CORENEURON_PROJECT_SOURCE_DIR} /external/CLI11/include )
2017add_dependencies (cmd_interface_test_bin nrniv-core)
2118
22- add_test (NAME cmd_interface_test COMMAND ${TEST_EXEC_PREFIX}
23- ${CMAKE_CURRENT_BINARY_DIR} /cmd_interface_test_bin)
19+ add_test (NAME cmd_interface_test COMMAND ${TEST_EXEC_PREFIX} $<TARGET_FILE:cmd_interface_test_bin>)
Original file line number Diff line number Diff line change 33#
44# See top-level LICENSE file for details.
55# =============================================================================
6-
7- file (GLOB interleave_info_src "*.cpp" )
8-
9- add_executable (interleave_info_bin ${interleave_info_src} )
6+ add_executable (interleave_info_bin check_constructors.cpp)
107target_link_libraries (
118 interleave_info_bin
129 ${MPI_CXX_LIBRARIES}
@@ -17,5 +14,5 @@ target_link_libraries(
1714 ${sonatareport_LIBRARY} )
1815add_dependencies (interleave_info_bin nrniv-core)
1916
20- add_test (NAME interleave_info_constructor_test
21- COMMAND ${TEST_EXEC_PREFIX} ${CMAKE_CURRENT_BINARY_DIR} / interleave_info_bin)
17+ add_test (NAME interleave_info_constructor_test COMMAND ${TEST_EXEC_PREFIX}
18+ $<TARGET_FILE: interleave_info_bin> )
Original file line number Diff line number Diff line change 33#
44# See top-level LICENSE file for details.
55# =============================================================================
6-
7- file (GLOB queuing_test_src "*.cpp" )
8-
9- add_executable (queuing_test_bin ${queuing_test_src} )
6+ add_executable (queuing_test_bin test_queueing.cpp)
107target_link_libraries (
118 queuing_test_bin
129 ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}
@@ -17,4 +14,4 @@ target_link_libraries(
1714 ${sonatareport_LIBRARY} )
1815add_dependencies (queuing_test_bin nrniv-core)
1916
20- add_test (NAME queuing_test COMMAND ${TEST_EXEC_PREFIX} ${CMAKE_CURRENT_BINARY_DIR} / queuing_test_bin)
17+ add_test (NAME queuing_test COMMAND ${TEST_EXEC_PREFIX} $<TARGET_FILE: queuing_test_bin> )
You can’t perform that action at this time.
0 commit comments