@@ -33,6 +33,13 @@ if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
3333 set (CORENEURON_AS_SUBPROJECT ON )
3434endif ()
3535
36+ # =============================================================================
37+ # Include cmake modules path
38+ # =============================================================================
39+ list (APPEND CMAKE_MODULE_PATH ${CORENEURON_PROJECT_SOURCE_DIR} /CMake
40+ ${CORENEURON_PROJECT_SOURCE_DIR} /CMake/packages
41+ ${CORENEURON_PROJECT_SOURCE_DIR} /CMake/config)
42+
3643# =============================================================================
3744# HPC Coding Conventions
3845# =============================================================================
@@ -43,15 +50,9 @@ set(CORENRN_ClangFormat_EXCLUDES_RE
4350set (CORENRN_CMakeFormat_EXCLUDES_RE
4451 ".*/external/.*$$" ".*/CMake/packages/.*$$"
4552 CACHE STRING "list of regular expressions to exclude CMake files from formatting" FORCE)
53+ include (AddHpcCodingConvSubmodule)
4654add_subdirectory (CMake/hpc-coding-conventions/cpp)
4755
48- # =============================================================================
49- # Include cmake modules path
50- # =============================================================================
51- list (APPEND CMAKE_MODULE_PATH ${CORENEURON_PROJECT_SOURCE_DIR} /CMake
52- ${CORENEURON_PROJECT_SOURCE_DIR} /CMake/packages
53- ${CORENEURON_PROJECT_SOURCE_DIR} /CMake/config)
54-
5556# =============================================================================
5657# Include common cmake modules
5758# =============================================================================
@@ -62,6 +63,7 @@ include(SetRpath)
6263include (CTest)
6364include (AddRandom123Submodule)
6465include (AddCLI11Submodule)
66+
6567add_subdirectory (${CORENEURON_PROJECT_SOURCE_DIR} /external/CLI11)
6668
6769# =============================================================================
@@ -106,7 +108,6 @@ endif()
106108# Include cmake modules after cmake options
107109# =============================================================================
108110include (OpenAccHelper)
109- include (ClangFormatHelper)
110111
111112# =============================================================================
112113# Common dependencies
0 commit comments