Skip to content
Snippets Groups Projects
Commit 0590105a authored by Marilena Bandieramonte's avatar Marilena Bandieramonte
Browse files

Fix to CMakeFiles to compile successfully on MacOs platform

parent 76d8e6ea
Branches
Tags
1 merge request!1Deprecate custom shape bundle
Pipeline #1494793 failed
......@@ -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)
......
......@@ -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 )
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment