Skip to content

Commit

Permalink
cmake fixes and fccDetectors -> FCCDetectors
Browse files Browse the repository at this point in the history
  • Loading branch information
vvolkl committed Nov 26, 2020
1 parent 320954b commit bddaec3
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 19 deletions.
16 changes: 11 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,22 @@ message(${CMAKE_MODULE_PATH})

add_subdirectory(Detector)

# - install and export
install(FILES
"${PROJECT_SOURCE_DIR}/cmake/${PROJECT_NAME}Config.cmake"
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}"
)





#install(EXPORT ${PROJECT_NAME}Targets
# NAMESPACE ${PROJECT_NAME}::
# FILE "${PROJECT_NAME}Targets.cmake"
# DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/"
# )

install(EXPORT ${PROJECT_NAME}Targets
NAMESPACE ${PROJECT_NAME}::
FILE "${PROJECT_NAME}Targets.cmake"
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/"
)

#gaudi_install(CMAKE cmake/${PROJECT_NAME}Config.cmake)

2 changes: 1 addition & 1 deletion Detector/DetCommon/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ set_target_properties(DetCommon PROPERTIES PUBLIC_HEADER "${headers}")


install(TARGETS DetCommon
EXPORT fccDetectorsTargets
EXPORT ${PROJECT_NAME}Targets
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT bin
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT shlib
PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/DetCommon"
Expand Down
2 changes: 1 addition & 1 deletion Detector/DetSegmentation/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ set_target_properties(DetSegmentation PROPERTIES PUBLIC_HEADER "${headers}")


install(TARGETS DetSegmentation
EXPORT fccDetectorsTargets
EXPORT ${PROJECT_NAME}Targets
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT bin
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT shlib
PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/DetSegmentation"
Expand Down
2 changes: 1 addition & 1 deletion Detector/DetSensitive/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ set_target_properties(DetSensitive PROPERTIES PUBLIC_HEADER "${headers}")


install(TARGETS DetSensitive
EXPORT fccDetectorsTargets
EXPORT ${PROJECT_NAME}Targets
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT bin
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT shlib
PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/DetSensitive"
Expand Down
10 changes: 10 additions & 0 deletions cmake/FCCDetectorsConfig.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@

#include(CMakeFindDependencyMacro)
#find_dependency(DD4hep REQUIRED)

# - Include the targets file to create the imported targets that a client can
# link to (libraries) or execute (programs)
include("${CMAKE_CURRENT_LIST_DIR}/FCCDetectorsTargets.cmake")

include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(FCCDetectors DEFAULT_MSG CMAKE_CURRENT_LIST_FILE)
11 changes: 0 additions & 11 deletions cmake/k4SimGeant4Config.cmake

This file was deleted.

0 comments on commit bddaec3

Please sign in to comment.