Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow more than one optimization flag to be set when running CMake #2551

Merged
merged 10 commits into from
Jan 12, 2023
Merged

Allow more than one optimization flag to be set when running CMake #2551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
df11641
Add more than one optimization flag
med-ayssar Nov 30, 2022
f271862
Use shorter solution
med-ayssar Dec 1, 2022
a9f289a
Add developer message
med-ayssar Dec 1, 2022
ad53b52
handle lowercase input
med-ayssar Dec 1, 2022
2211d4d
Revert file formatting
med-ayssar Dec 1, 2022
8da3f9e
Fix variable name
med-ayssar Dec 1, 2022
0c9eb83
Replace set with string append
med-ayssar Dec 2, 2022
45c2dda
Merge branch 'optimizer_flags' of github.com:med-ayssar/nest-simulato…
med-ayssar Dec 2, 2022
1a9789c
Change string append to join on the whole list
med-ayssar Dec 2, 2022
c6d9b73
Update CMakeLists.txt
jougs Jan 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,6 @@ get_target_triple( NEST_TARGET_TRIPLE NEST_TARGET_ARCH NEST_TARGET_VENDOR NEST_T
nest_process_with_python()
include( GNUInstallDirs )
nest_post_process_with_python()
nest_process_with_optimize()
nest_process_with_debug()
nest_process_with_std()
nest_process_with_intel_compiler_flags()
nest_process_with_warning()
Expand All @@ -156,6 +154,12 @@ nest_process_version_suffix()
nest_process_userdoc()
nest_process_devdoc()

# These two function calls must come last, as to prevent unwanted interactions of the newly set flags
# with detection/compilation operations carried out in earlier functions. The optimize/debug flags set
# using these functions should only apply to the compilation of NEST.
nest_process_with_optimize()
nest_process_with_debug()
terhorstd marked this conversation as resolved.
Show resolved Hide resolved

nest_get_color_flags()
set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${NEST_C_COLOR_FLAGS}" )
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${NEST_CXX_COLOR_FLAGS}" )
Expand Down
11 changes: 6 additions & 5 deletions cmake/ProcessOptions.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,14 @@
# add custom warnings and optimizations
function( NEST_PROCESS_WITH_OPTIMIZE )
if ( with-optimize )
if ( with-optimize STREQUAL "ON" )
string(TOUPPER "${with-optimize}" WITHOPTIMIZE)
if ( WITHOPTIMIZE STREQUAL "ON" )
set( with-optimize "-O2" )
endif ()
foreach ( flag ${with-optimize} )
set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${flag}" PARENT_SCOPE )
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}" PARENT_SCOPE )
endforeach ()
set(OPTIMIZATION_FLAGS "")
string(JOIN " " OPTIMIZATION_FLAGS ${with-optimize} )
set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OPTIMIZATION_FLAGS}" PARENT_SCOPE )
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OPTIMIZATION_FLAGS}" PARENT_SCOPE )
gtrensch marked this conversation as resolved.
Show resolved Hide resolved
endif ()
endfunction()

Expand Down