Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
GeoModelG4
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
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
GeoModelDev
GeoModelG4
Commits
0590105a
Commit
0590105a
authored
5 years ago
by
Marilena Bandieramonte
Browse files
Options
Downloads
Patches
Plain Diff
Fix to CMakeFiles to compile successfully on MacOs platform
parent
76d8e6ea
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!1
Deprecate custom shape bundle
Pipeline
#1494793
failed
5 years ago
Stage: deps-A
Stage: deps-B
Stage: deps-C
Stage: deps-D
Stage: build
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+7
-1
7 additions, 1 deletion
CMakeLists.txt
GeoSpecialShapes/CMakeLists.txt
+6
-14
6 additions, 14 deletions
GeoSpecialShapes/CMakeLists.txt
with
13 additions
and
15 deletions
CMakeLists.txt
+
7
−
1
View file @
0590105a
...
...
@@ -3,12 +3,18 @@ cmake_minimum_required( VERSION 3.1 )
project
(
"GeoModelG4"
VERSION 1.0.0 LANGUAGES CXX
)
set
(
CMAKE_CXX_STANDARD 17
)
set
(
CMAKE_CXX_STANDARD_REQUIRED ON
)
set
(
CMAKE_CXX_EXTENSIONS OFF
)
# Set up the build of the three libraries of the project.
add_subdirectory
(
GeoSpecialShapes
)
add_subdirectory
(
GeoMaterial2G4
)
add_subdirectory
(
GeoModel2G4
)
add_subdirectory
(
GeoSpecialShapes
)
install
(
EXPORT GeoSpecialShapes-export FILE GeoModelG4-GeoSpecialShapes.cmake DESTINATION lib/cmake/GeoModelG4
)
install
(
EXPORT GeoMaterial2G4-export FILE GeoModelG4-GeoMaterial2G4.cmake DESTINATION lib/cmake/GeoModelG4
)
install
(
EXPORT GeoModel2G4-export FILE GeoModelG4-GeoModel2G4.cmake DESTINATION lib/cmake/GeoModelG4
)
install
(
FILES cmake/GeoModelG4Config.cmake DESTINATION lib/cmake/GeoModelG4
)
...
...
This diff is collapsed.
Click to expand it.
GeoSpecialShapes/CMakeLists.txt
+
6
−
14
View file @
0590105a
...
...
@@ -29,17 +29,9 @@ set_target_properties( GeoSpecialShapes PROPERTIES
SOVERSION
${
PROJECT_VERSION_MAJOR
}
)
# Install the library.
install
(
TARGETS GeoSpecialShapes
EXPORT
${
PROJECT_NAME
}
-export
LIBRARY DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
COMPONENT Runtime
NAMELINK_SKIP
)
install
(
TARGETS GeoSpecialShapes
EXPORT
${
PROJECT_NAME
}
-export
LIBRARY DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
COMPONENT Development
NAMELINK_ONLY
)
install
(
FILES
${
HEADERS
}
DESTINATION
${
CMAKE_INSTALL_INCLUDEDIR
}
/GeoSpecialShapes
COMPONENT Development
)
# new test GeoModelG4
install
(
TARGETS GeoSpecialShapes EXPORT GeoSpecialShapes-export LIBRARY DESTINATION
${
CMAKE_INSTALL_LIBDIR
}
PUBLIC_HEADER DESTINATION
${
CMAKE_INSTALL_INCLUDEDIR
}
/GeoSpecialShapes
)
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