Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
GeoModel
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
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
GeoModelDev
GeoModel
Commits
b52cf0c1
Commit
b52cf0c1
authored
2 years ago
by
Riccardo Maria Bianchi
Browse files
Options
Downloads
Patches
Plain Diff
Print info about build type and C++ standard
parent
624c1165
No related branches found
Branches containing commit
No related tags found
2 merge requests
!170
Merging latest CMake fixes from master into the branch to test the new CI single-build jobs
,
!168
Fix FullSimLight and FSL builds for distribution kits, and make HepMC3 dependency optional
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
GeoModelG4/CMakeLists.txt
+4
-0
4 additions, 0 deletions
GeoModelG4/CMakeLists.txt
GeoModelTools/CMakeLists.txt
+4
-0
4 additions, 0 deletions
GeoModelTools/CMakeLists.txt
GeoModelVisualization/CMakeLists.txt
+4
-0
4 additions, 0 deletions
GeoModelVisualization/CMakeLists.txt
with
12 additions
and
0 deletions
GeoModelG4/CMakeLists.txt
+
4
−
0
View file @
b52cf0c1
...
@@ -18,6 +18,8 @@ if( (CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) OR GEOMODEL_BUILD_GEOMODELG4_
...
@@ -18,6 +18,8 @@ if( (CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) OR GEOMODEL_BUILD_GEOMODELG4_
include
(
cmake_colors_defs
)
include
(
cmake_colors_defs
)
# Warn the users about what they are doing
# Warn the users about what they are doing
message
(
STATUS
"
${
BoldGreen
}
Building
${
PROJECT_NAME
}
individually, as a top-level project.
${
ColourReset
}
"
)
message
(
STATUS
"
${
BoldGreen
}
Building
${
PROJECT_NAME
}
individually, as a top-level project.
${
ColourReset
}
"
)
# Set a default build type
include
(
BuildType
)
# Set default build and C++ options
# Set default build and C++ options
include
(
configure_cpp_options
)
include
(
configure_cpp_options
)
set
(
CMAKE_FIND_FRAMEWORK
"LAST"
CACHE STRING
set
(
CMAKE_FIND_FRAMEWORK
"LAST"
CACHE STRING
...
@@ -31,6 +33,8 @@ if( (CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) OR GEOMODEL_BUILD_GEOMODELG4_
...
@@ -31,6 +33,8 @@ if( (CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) OR GEOMODEL_BUILD_GEOMODELG4_
endif
()
endif
()
# Set a flag to steer the of the subpackages
# Set a flag to steer the of the subpackages
set
(
${
PROJECT_NAME
}
_INDIVIDUAL_BUILD ON
)
set
(
${
PROJECT_NAME
}
_INDIVIDUAL_BUILD ON
)
# Print Build Info on screen
include
(
PrintBuildInfo
)
else
()
else
()
# I am called from other projects with add_subdirectory().
# I am called from other projects with add_subdirectory().
message
(
STATUS
"Building
${
PROJECT_NAME
}
as part of the root GeoModel project."
)
message
(
STATUS
"Building
${
PROJECT_NAME
}
as part of the root GeoModel project."
)
...
...
This diff is collapsed.
Click to expand it.
GeoModelTools/CMakeLists.txt
+
4
−
0
View file @
b52cf0c1
...
@@ -19,6 +19,8 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
...
@@ -19,6 +19,8 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
include
(
cmake_colors_defs
)
include
(
cmake_colors_defs
)
# Warn the users about what they are doing
# Warn the users about what they are doing
message
(
STATUS
"
${
BoldGreen
}
Building
${
PROJECT_NAME
}
individually, as a top-level project.
${
ColourReset
}
"
)
message
(
STATUS
"
${
BoldGreen
}
Building
${
PROJECT_NAME
}
individually, as a top-level project.
${
ColourReset
}
"
)
# Set a default build type
include
(
BuildType
)
# Set default build and C++ options
# Set default build and C++ options
include
(
configure_cpp_options
)
include
(
configure_cpp_options
)
set
(
CMAKE_FIND_FRAMEWORK
"LAST"
CACHE STRING
set
(
CMAKE_FIND_FRAMEWORK
"LAST"
CACHE STRING
...
@@ -36,6 +38,8 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
...
@@ -36,6 +38,8 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
find_package
(
GeoModelIO REQUIRED
${
GeoModel_VERSION
}
)
find_package
(
GeoModelIO REQUIRED
${
GeoModel_VERSION
}
)
# Set a flag to steer the build of the subpackages
# Set a flag to steer the build of the subpackages
#set( VISUALIZATION_INDIVIDUAL_BUILD ON )
#set( VISUALIZATION_INDIVIDUAL_BUILD ON )
# Print Build Info on screen
include
(
PrintBuildInfo
)
else
()
else
()
# I am called from other project with add_subdirectory().
# I am called from other project with add_subdirectory().
message
(
STATUS
"Building
${
PROJECT_NAME
}
as part of the root GeoModel project."
)
message
(
STATUS
"Building
${
PROJECT_NAME
}
as part of the root GeoModel project."
)
...
...
This diff is collapsed.
Click to expand it.
GeoModelVisualization/CMakeLists.txt
+
4
−
0
View file @
b52cf0c1
...
@@ -24,6 +24,8 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
...
@@ -24,6 +24,8 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
include
(
cmake_colors_defs
)
include
(
cmake_colors_defs
)
# Warn the users about what they are doing
# Warn the users about what they are doing
message
(
STATUS
"
${
BoldGreen
}
Building
${
PROJECT_NAME
}
individually, as a top-level project.
${
ColourReset
}
"
)
message
(
STATUS
"
${
BoldGreen
}
Building
${
PROJECT_NAME
}
individually, as a top-level project.
${
ColourReset
}
"
)
# Set a default build type
include
(
BuildType
)
# Set default build and C++ options
# Set default build and C++ options
include
(
configure_cpp_options
)
include
(
configure_cpp_options
)
set
(
CMAKE_FIND_FRAMEWORK
"LAST"
CACHE STRING
set
(
CMAKE_FIND_FRAMEWORK
"LAST"
CACHE STRING
...
@@ -33,6 +35,8 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
...
@@ -33,6 +35,8 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
find_package
(
GeoModelIO REQUIRED
${
GeoModel_VERSION
}
)
find_package
(
GeoModelIO REQUIRED
${
GeoModel_VERSION
}
)
# Set a flag to steer the build of the subpackages
# Set a flag to steer the build of the subpackages
set
(
VISUALIZATION_INDIVIDUAL_BUILD ON
)
set
(
VISUALIZATION_INDIVIDUAL_BUILD ON
)
# Print Build Info on screen
include
(
PrintBuildInfo
)
else
()
else
()
# I am called from other project with add_subdirectory().
# I am called from other project with add_subdirectory().
message
(
STATUS
"Building
${
PROJECT_NAME
}
as part of the root GeoModel project."
)
message
(
STATUS
"Building
${
PROJECT_NAME
}
as part of the root GeoModel project."
)
...
...
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