@@ -33,6 +33,13 @@ if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
33
33
set (CORENEURON_AS_SUBPROJECT ON )
34
34
endif ()
35
35
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
+
36
43
# =============================================================================
37
44
# HPC Coding Conventions
38
45
# =============================================================================
@@ -43,15 +50,9 @@ set(CORENRN_ClangFormat_EXCLUDES_RE
43
50
set (CORENRN_CMakeFormat_EXCLUDES_RE
44
51
".*/external/.*$$" ".*/CMake/packages/.*$$"
45
52
CACHE STRING "list of regular expressions to exclude CMake files from formatting" FORCE )
53
+ include (AddHpcCodingConvSubmodule )
46
54
add_subdirectory (CMake/hpc-coding-conventions/cpp )
47
55
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
-
55
56
# =============================================================================
56
57
# Include common cmake modules
57
58
# =============================================================================
@@ -62,6 +63,7 @@ include(SetRpath)
62
63
include (CTest )
63
64
include (AddRandom123Submodule )
64
65
include (AddCLI11Submodule )
66
+
65
67
add_subdirectory (${CORENEURON_PROJECT_SOURCE_DIR} /external/CLI11 )
66
68
67
69
# =============================================================================
@@ -106,7 +108,6 @@ endif()
106
108
# Include cmake modules after cmake options
107
109
# =============================================================================
108
110
include (OpenAccHelper )
109
- include (ClangFormatHelper )
110
111
111
112
# =============================================================================
112
113
# Common dependencies
0 commit comments