Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
N
nicafemto
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
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
NICA
nicafemto
Commits
27522c4c
Commit
27522c4c
authored
3 years ago
by
Daniel Wielanek
Browse files
Options
Downloads
Patches
Plain Diff
try to fing gsl and boost
parent
70e0aa5a
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Pipeline
#16522
failed
3 years ago
Stage: build
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+4
-1
4 additions, 1 deletion
CMakeLists.txt
cmake/modules/CMakeListsExternal.cmake
+15
-15
15 additions, 15 deletions
cmake/modules/CMakeListsExternal.cmake
with
19 additions
and
16 deletions
CMakeLists.txt
+
4
−
1
View file @
27522c4c
CMAKE_MINIMUM_REQUIRED
(
VERSION 3.11.0 FATAL_ERROR
)
if
(
DEFINED $ENV{SIMPATH}
)
if
(
DEFINED ENV{SIMPATH}
)
message
(
warning
"SIMPATH found"
)
include
(
cmake/modules/CMakeListsLegacy.cmake
)
else
()
message
(
warning
"SIMPATH NOT found"
)
set
(
DISABLE_JSROOT
)
include
(
cmake/modules/CMakeListsExternal.cmake
)
endif
()
This diff is collapsed.
Click to expand it.
cmake/modules/CMakeListsExternal.cmake
+
15
−
15
View file @
27522c4c
...
...
@@ -53,7 +53,7 @@ if(NOT DEFINED NICAFEMTO_SUBDIR_BUILD)
Message
(
FATAL_ERROR
"The used C++ compiler (
${
CMAKE_CXX_COMPILER
}
) does not support C++11. NicaFemto can only be compiled with compilers supporting C++11. Please install such an compiler."
)
EndIf
()
target_compile_features
(
${
TARGET_NAME
}
PRIVATE cxx_std_17
)
#
target_compile_features(${TARGET_NAME} PRIVATE cxx_std_17)
Set
(
LIBRARY_OUTPUT_PATH
"
${
CMAKE_BINARY_DIR
}
/lib"
)
...
...
@@ -91,15 +91,10 @@ if(NOT DEFINED NICAFEMTO_SUBDIR_BUILD)
endif
()
Set
(
Boost_NO_SYSTEM_PATHS TRUE
)
Set
(
Boost_NO_BOOST_CMAKE TRUE
)
if
(
NOT DEFINED NICAFEMTO_BOOST
)
Message
(
FATAL_ERROR
"Cannot find default path to BOOST, set NICAFEMTO_BOOST"
)
endif
()
if
(
NOT DEFINED NICAFEMTO_GLS
)
Message
(
FATAL_ERROR
"Cannot find default path to GSL, set NICAFEMTO_GSL"
)
endif
()
Set
(
BOOST_ROOT
${
NICAFEMTO_BOOST
}
)
Set
(
GSL_DIR
${
NICAFEMTO_GLS
}
)
# Set(BOOST_ROOT ${NICAFEMTO_BOOST})
# Set(GSL_DIR ${NICAFEMTO_GLS})
Message
(
"-- Looking for Boost ..."
)
# If an older version of boost is found both of the variables below are
...
...
@@ -112,7 +107,10 @@ if(NOT DEFINED NICAFEMTO_SUBDIR_BUILD)
find_package
(
Boost 1.48 COMPONENTS program_options thread system timer serialization regex log log_setup filesystem
)
If
(
Boost_FOUND
)
Set
(
Boost_Avail 1
)
Else
(
Boost_FOUND
)
Else
()
if
(
NOT DEFINED NICAFEMTO_BOOST
)
Message
(
FATAL_ERROR
"Cannot find BOOST, set NICAFEMTO_BOOST"
)
endif
()
Set
(
Boost_Avail 0
)
EndIf
(
Boost_FOUND
)
...
...
@@ -121,12 +119,14 @@ if(NOT DEFINED NICAFEMTO_SUBDIR_BUILD)
if
(
NOT GSL_FOUND
)
if
(
APPLE
)
set
(
GSL_DIR /usr/local
)
else
()
unset
(
GSL_DIR
)
else
()
if
(
NOT DEFINED NICAFEMTO_GLS
)
Message
(
FATAL_ERROR
"Cannot find default path to GSL, set NICAFEMTO_GSL"
)
endif
()
endif
()
find_package
(
GSL REQUIRED
)
#
find_package(GSL REQUIRED)
endif
()
Find_Package
(
FairLogger
)
Find_Package
(
FairLogger
REQUIRED
)
Find_Package
(
FairMQ
)
SetBasicVariables
()
...
...
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