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
6306b41d
Commit
6306b41d
authored
4 years ago
by
Riccardo Maria Bianchi
Browse files
Options
Downloads
Patches
Plain Diff
Fix built-in JSON cmake config when building all subprojects
parent
76f88c5c
No related branches found
No related tags found
1 merge request
!25
Fix builtin JSON
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
FullSimLight/CMakeLists.txt
+5
-3
5 additions, 3 deletions
FullSimLight/CMakeLists.txt
GeoModelG4/CMakeLists.txt
+7
-5
7 additions, 5 deletions
GeoModelG4/CMakeLists.txt
GeoModelVisualization/CMakeLists.txt
+5
-3
5 additions, 3 deletions
GeoModelVisualization/CMakeLists.txt
with
17 additions
and
11 deletions
FullSimLight/CMakeLists.txt
+
5
−
3
View file @
6306b41d
...
...
@@ -17,9 +17,11 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
include
(
configure_cpp_options
)
set
(
CMAKE_FIND_FRAMEWORK
"LAST"
CACHE STRING
"Framework finding behaviour on macOS"
)
# Set up how the project handle some of its dependenices. Either by picking them
# up from the environment, or building them itself.
include
(
SetupJSON
)
if
(
NOT TARGET JSONExt
)
# Set up how the project handle some of its dependenices. Either by picking them
# up from the environment, or building them itself.
include
(
SetupJSON
)
endif
()
# Find the base GeoModel packages, which must be installed on the target system already
find_package
(
GeoModelCore REQUIRED 4.0.0
)
#TODO: the version should be se in the root folder
find_package
(
GeoModelIO REQUIRED 4.0.0
)
#TODO: the version should be se in the root folder
...
...
This diff is collapsed.
Click to expand it.
GeoModelG4/CMakeLists.txt
+
7
−
5
View file @
6306b41d
...
...
@@ -2,8 +2,8 @@
cmake_minimum_required
(
VERSION 3.1
)
project
(
"GeoModelG4"
VERSION 1.1.0 LANGUAGES CXX
)
message
(
"CMAKE_SOURCE_DIR:
${
CMAKE_SOURCE_DIR
}
"
)
message
(
"PROJECT_SOURCE_DIR:
${
PROJECT_SOURCE_DIR
}
"
)
#
message("CMAKE_SOURCE_DIR: ${CMAKE_SOURCE_DIR}")
# debug msg
#
message("PROJECT_SOURCE_DIR: ${PROJECT_SOURCE_DIR}")
# debug msg
if
(
(
CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR
)
OR GEOMODEL_BUILD_GEOMODELG4
)
# I am top-level project.
# Make the root module directory visible to CMake.
...
...
@@ -16,9 +16,11 @@ if( (CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR) OR GEOMODEL_BUILD_GEOMODELG4
include
(
configure_cpp_options
)
set
(
CMAKE_FIND_FRAMEWORK
"LAST"
CACHE STRING
"Framework finding behaviour on macOS"
)
# Set up how the project handle some of its dependenices. Either by picking them
# up from the environment, or building them itself.^[[?12;4$y
include
(
SetupJSON
)
if
(
NOT TARGET JSONExt
)
# Set up how the project handle some of its dependenices. Either by picking them
# up from the environment, or building them itself.
include
(
SetupJSON
)
endif
()
# Find the base GeoModel packages, which must be installed on the target system already
find_package
(
GeoModelCore REQUIRED 4.0.0
)
#TODO: the version should be se in the root folder
# Set a flag to steer the of the subpackages
...
...
This diff is collapsed.
Click to expand it.
GeoModelVisualization/CMakeLists.txt
+
5
−
3
View file @
6306b41d
...
...
@@ -19,9 +19,11 @@ if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
include
(
configure_cpp_options
)
set
(
CMAKE_FIND_FRAMEWORK
"LAST"
CACHE STRING
"Framework finding behaviour on macOS"
)
# Set up how the project handle some of its dependenices. Either by picking them
# up from the environment, or building them itself.
include
(
SetupJSON
)
if
(
NOT TARGET JSONExt
)
# Set up how the project handle some of its dependenices. Either by picking them
# up from the environment, or building them itself.
include
(
SetupJSON
)
endif
()
# Find the base GeoModel packages, which must be installed on the target system already
find_package
(
GeoModelCore REQUIRED 4.0.0
)
#TODO: the version should be se in the root folder
find_package
(
GeoModelIO REQUIRED 4.0.0
)
#TODO: the version should be se in the root folder
...
...
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