Skip to content
This repository was archived by the owner on Mar 20, 2023. It is now read-only.

Commit 1713e4b

Browse files
pramodkpramodk
committed
Various nitpicks to prepare PR for review
 - nmodl submodule updated latest master
1 parent 1ba6ad8 commit 1713e4b

26 files changed

Lines changed: 156 additions & 113 deletions

‎CMake/AddCLI11Submodule.cmake‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
# =============================================================================
2-
# Copyright (C) 2020 Blue Brain Project
2+
# Copyright (C) 2016-2020 Blue Brain Project
33
#
44
# See top-level LICENSE file for details.
55
# =============================================================================
66

77
include(FindPackageHandleStandardArgs)
88
find_package(FindPkgConfig QUIET)
9+
910
find_path(
1011
CLI11_PROJ
1112
NAMES CMakeLists.txt
1213
PATHS "${CORENEURON_PROJECT_SOURCE_DIR}/external/CLI11")
14+
1315
find_package_handle_standard_args(CLI11 REQUIRED_VARS CLI11_PROJ)
1416

1517
if(NOT CLI11_FOUND)

‎CMake/AddMod2cSubmodule.cmake‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
# =============================================================================
2-
# Copyright (C) 2016-2019 Blue Brain Project
2+
# Copyright (C) 2016-2020 Blue Brain Project
33
#
44
# See top-level LICENSE file for details.
55
# =============================================================================
66

77
include(ExternalProject)
8-
98
find_package(FindPkgConfig QUIET)
9+
1010
find_path(
1111
MOD2C_PROJ
1212
NAMES CMakeLists.txt
1313
PATHS "${CORENEURON_PROJECT_SOURCE_DIR}/external/mod2c")
14+
1415
find_package_handle_standard_args(MOD2C REQUIRED_VARS MOD2C_PROJ)
1516

1617
if(NOT MOD2C_FOUND)

‎CMake/AddNmodlSubmodule.cmake‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
# =============================================================================
2-
# Copyright (C) 2016-2019 Blue Brain Project
2+
# Copyright (C) 2016-2020 Blue Brain Project
33
#
44
# See top-level LICENSE file for details.
55
# =============================================================================
66

77
find_package(FindPkgConfig QUIET)
8+
89
find_path(
910
NMODL_PROJ
1011
NAMES CMakeLists.txt
1112
PATHS "${CORENEURON_PROJECT_SOURCE_DIR}/external/nmodl")
13+
1214
find_package_handle_standard_args(NMODL REQUIRED_VARS NMODL_PROJ)
1315

1416
if(NOT NMODL_FOUND)

‎CMake/AddRandom123Submodule.cmake‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
# =============================================================================
2-
# Copyright (C) 2020 Blue Brain Project
2+
# Copyright (C) 2016-2020 Blue Brain Project
33
#
44
# See top-level LICENSE file for details.
55
# =============================================================================
66

77
include(FindPackageHandleStandardArgs)
88
find_package(FindPkgConfig QUIET)
9+
910
find_path(
1011
Random123_PROJ
1112
NAMES LICENSE
1213
PATHS "${CORENEURON_PROJECT_SOURCE_DIR}/external/Random123")
14+
1315
find_package_handle_standard_args(Random123 REQUIRED_VARS Random123_PROJ)
1416

1517
if(NOT Random123_FOUND)

‎CMake/CMakeDetermineISPCCompiler.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# =============================================================================
2-
# Copyright (C) 2016-2019 Blue Brain Project
2+
# Copyright (C) 2016-2020 Blue Brain Project
33
#
44
# See top-level LICENSE file for details.
55
# =============================================================================
66

7-
# Find the compiler
7+
# Find the ISPC compiler
88
find_program(
99
CMAKE_ISPC_COMPILER
1010
NAMES $ENV{ISPC} ispc

‎CMake/CMakeTestISPCCompiler.cmake‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
if(CMAKE_ISPC_COMPILER_FORCED)
2-
# The compiler configuration was forced by the user. Assume the user has configured all compiler
3-
# information.
2+
# ~~~
3+
# The compiler configuration was forced by the user. Assume the user has
4+
# configured all compiler information.
5+
# ~~~
46
set(CMAKE_ISPC_COMPILER_WORKS TRUE)
57
return()
68
endif()
@@ -13,9 +15,11 @@ set(CMAKE_ISPC_COMPILER_WORKS
1315
# CMakeISPCCompiler.cmake.
1416
unset(CMAKE_ISPC_COMPILER_WORKS CACHE)
1517

16-
# This file is used by EnableLanguage in cmGlobalGenerator to determine that the selected ispc
17-
# compiler can actually compile and the most basic program. If not, a fatal error is set and cmake
18-
# stops processing commands and will not generate any makefiles or projects.
18+
# ~~~
19+
# This file is used by EnableLanguage in cmGlobalGenerator to determine that the selected
20+
# ispc compiler can actually compile and the most basic program. If not, a fatal error is
21+
# set and cmake stops processing commands and will not generate any makefiles or projects.
22+
# ~~~
1923
if(NOT CMAKE_ISPC_COMPILER_WORKS)
2024
printtestcompilerstatus("ISPC" "")
2125
file(WRITE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/kernel.ispc
@@ -39,6 +43,7 @@ if(NOT CMAKE_ISPC_COMPILER_WORKS)
3943
set(ISPC_TEST_WAS_RUN 1)
4044
endif()
4145

46+
# Print compiler status
4247
if(NOT CMAKE_ISPC_COMPILER_WORKS)
4348
printtestcompilerstatus("ISPC" " -- broken")
4449
file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log

‎CMake/ClangFormatHelper.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# =============================================================================
2-
# Copyright (C) 2016-2019 Blue Brain Project
2+
# Copyright (C) 2016-2020 Blue Brain Project
33
#
44
# See top-level LICENSE file for details.
55
# =============================================================================

‎CMake/ClangFormatUtils.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# =============================================================================
2-
# Copyright (C) 2016-2019 Blue Brain Project
2+
# Copyright (C) 2016-2020 Blue Brain Project
33
#
44
# See top-level LICENSE file for details.
55
# =============================================================================

‎CMake/CrayPortability.cmake‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# =============================================================================
2-
# Copyright (C) 2016-2019 Blue Brain Project
2+
# Copyright (C) 2016-2020 Blue Brain Project
33
#
44
# See top-level LICENSE file for details.
55
# =============================================================================
@@ -19,13 +19,13 @@ if(CRAY_SYSTEM)
1919
set(MPI_C_LIBRARIES "")
2020
set(MPI_CXX_LIBRARIES "")
2121

22-
# instead of -rdynamic, cray wrapper needs either -dynamic or -static(default) also cray compiler
23-
# needs fPIC flag
22+
# ~~~
23+
# instead of -rdynamic, cray wrapper needs either -dynamic or -static(default)
24+
# also cray compiler needs fPIC flag
25+
# ~~~
2426
if(COMPILE_LIBRARY_TYPE STREQUAL "SHARED")
2527
set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "-dynamic")
26-
27-
# TODO: add Cray compiler flag configurations in CompilerFlagsHelpers.cmake Cray compilers need
28-
# PIC flag
28+
# TODO: add Cray compiler flag configurations in CompilerFlagsHelpers.cmake
2929
if(CMAKE_C_COMPILER_IS_CRAY)
3030
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
3131
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")

‎CMake/NmodlHelper.cmake‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
11
# =============================================================================
2-
# Copyright (C) 2016-2019 Blue Brain Project
2+
# Copyright (C) 2016-2020 Blue Brain Project
33
#
44
# See top-level LICENSE file for details.
55
# =============================================================================
66

7-
# Macro sets up build rule for .cpp files from .mod files. Parameters: KEY name : An
8-
# arbitrary name to keep track of output .c files MODFILE input : The path to the mod file
7+
# ~~~
8+
# Macro sets up build rule for .cpp files from .mod files. Parameters:
9+
# KEY name : An arbitrary name to keep track of output .c files
10+
# MODFILE input : The path to the mod file
911
# OUTTYPE <SERIAL|ISPC> : The output type (optional, defaults to serial)
1012
#
11-
# Because nmodl/mod2c_core wants to write the .cpp file in the same directory as the mod file, we
12-
# copy the mod file to the binary directory first
13+
# Because nmodl/mod2c_core wants to write the .cpp file in the same directory as the mod file,
14+
# we copy the mod file to the binary directory first
1315
#
14-
# The macro appends the names of the output files to NMODL_${name}_OUTPUTS and the names of the mod
15-
# files (without directories) to NMODL_${name}_MODS
16+
# The macro appends the names of the output files to NMODL_${name}_OUTPUTS and the names of the
17+
# mod files (without directories) to NMODL_${name}_MODS
18+
# ~~~
1619

1720
macro(nmodl_to_cpp_target)
18-
1921
# first parse the arguments
2022
set(options)
2123
set(oneValueArgs TARGET MODFILE KEY)

0 commit comments

Comments
 (0)