Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
cbmroot
Manage
Activity
Members
Labels
Plan
Wiki
Redmine
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Computing
cbmroot
Commits
b4accc48
Commit
b4accc48
authored
4 years ago
by
Administrator
Browse files
Options
Downloads
Patches
Plain Diff
Pass CXX standard information to external projects
parent
08787c8f
No related branches found
No related tags found
1 merge request
!191
Fix CbmRoot for FairSoft nov20 usage
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
external/InstallKFParticle.cmake
+2
-0
2 additions, 0 deletions
external/InstallKFParticle.cmake
external/InstallNicaFemto.cmake
+1
-0
1 addition, 0 deletions
external/InstallNicaFemto.cmake
external/KFParticle.patch
+22
-0
22 additions, 0 deletions
external/KFParticle.patch
with
25 additions
and
0 deletions
external/InstallKFParticle.cmake
+
2
−
0
View file @
b4accc48
...
...
@@ -8,6 +8,7 @@ download_project_if_needed(PROJECT kfparticle_source
GIT_TAG
"98712bbb2e2ae633e16a543ec38fea62a9ca2053"
SOURCE_DIR
${
CMAKE_CURRENT_SOURCE_DIR
}
/KFParticle
TEST_FILE CMakeLists.txt
PATCH_COMMAND
"patch -p1 <
${
CMAKE_CURRENT_SOURCE_DIR
}
/KFParticle.patch"
)
If
(
ProjectUpdated
)
...
...
@@ -27,6 +28,7 @@ ExternalProject_Add(KFPARTICLE
-DCMAKE_C_FLAGS=
${
CMAKE_C_FLAGS
}
-DCMAKE_CXX_COMPILER=
${
CMAKE_CXX_COMPILER
}
-DCMAKE_CXX_FLAGS=
${
CMAKE_CXX_FLAGS
}
-DCMAKE_CXX_STANDARD=
${
CMAKE_CXX_STANDARD
}
-DCMAKE_INSTALL_PREFIX=
${
CMAKE_BINARY_DIR
}
-DVc_INCLUDE_DIR=
${
Vc_INCLUDE_DIR
}
-DVc_LIBRARIES=
${
Vc_LIBRARY
}
...
...
This diff is collapsed.
Click to expand it.
external/InstallNicaFemto.cmake
+
1
−
0
View file @
b4accc48
...
...
@@ -32,6 +32,7 @@ ExternalProject_Add(NICAFEMTO
-DCMAKE_C_FLAGS=
${
CMAKE_C_FLAGS
}
-DCMAKE_CXX_COMPILER=
${
CMAKE_CXX_COMPILER
}
-DCMAKE_CXX_FLAGS=
${
CMAKE_CXX_FLAGS
}
-DCMAKE_CXX_STANDARD=
${
CMAKE_CXX_STANDARD
}
-DCMAKE_INSTALL_PREFIX=
${
CMAKE_BINARY_DIR
}
-DROOTSYS=
${
SIMPATH
}
-DJSROOT=
${
CMAKE_CURRENT_SOURCE_DIR
}
...
...
This diff is collapsed.
Click to expand it.
external/KFParticle.patch
0 → 100644
+
22
−
0
View file @
b4accc48
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6fbd90c..5a131e9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,11 +12,13 @@
macro(add_target_property _target _prop _value)
endmacro(add_target_property)
if (CMAKE_VERSION VERSION_LESS "3.1")
-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
- set (CMAKE_CXX_FLAGS "--std=gnu++11 ${CMAKE_CXX_FLAGS}")
-endif ()
+ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+ set (CMAKE_CXX_FLAGS "--std=gnu++11 ${CMAKE_CXX_FLAGS}")
+ endif ()
else ()
- set (CMAKE_CXX_STANDARD 11)
+ if(NOT CMAKE_CXX_STANDARD)
+ set (CMAKE_CXX_STANDARD 11)
+ endif()
endif ()
list(APPEND CMAKE_PREFIX_PATH $ENV{ROOTSYS} ${ROOTSYS})
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment