From e318c70dd2556324de5b63f1a1b218b4be0e90a3 Mon Sep 17 00:00:00 2001
From: Whitney Armstrong <warmstrong@anl.gov>
Date: Wed, 8 Nov 2017 12:16:20 -0600
Subject: [PATCH] Added "NOINSTALL" option to cmake build function
dd4hep_add_library
This is particularly useful for allowing the user to export targets
during install.
---
cmake/DD4hepBuild.cmake | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/cmake/DD4hepBuild.cmake b/cmake/DD4hepBuild.cmake
index 0894ad671..386b0004b 100644
--- a/cmake/DD4hepBuild.cmake
+++ b/cmake/DD4hepBuild.cmake
@@ -962,7 +962,7 @@ endfunction()
#
#---------------------------------------------------------------------------------------------------
function( dd4hep_add_library binary building )
- cmake_parse_arguments ( ARG "NODEFAULTS" "" "SOURCES;GENERATED;LINK_LIBRARIES;INCLUDE_DIRS;USES;OPTIONAL;DEFINITIONS;PRINT" ${ARGN} )
+ cmake_parse_arguments ( ARG "NODEFAULTS;NOINSTALL" "" "SOURCES;GENERATED;LINK_LIBRARIES;INCLUDE_DIRS;USES;OPTIONAL;DEFINITIONS;PRINT" ${ARGN} )
dd4hep_package_properties( pkg PKG_NAME enabled )
set ( tag "Library[${pkg}] -> ${binary}" )
if ( NOT "${ARG_PRINT}" STREQUAL "" )
@@ -1026,9 +1026,11 @@ function( dd4hep_add_library binary building )
##dd4hep_print ( "set_target_properties ( ${binary} PROPERTIES VERSION ${${pkg}_VERSION} SOVERSION ${${pkg}_SOVERSION})")
set_target_properties ( ${binary} PROPERTIES VERSION ${${pkg}_VERSION} SOVERSION ${${pkg}_SOVERSION})
#
- install ( TARGETS ${binary}
- LIBRARY DESTINATION lib
- RUNTIME DESTINATION bin)
+ if ( NOT ${ARG_NOINSTALL} )
+ install ( TARGETS ${binary}
+ LIBRARY DESTINATION lib
+ RUNTIME DESTINATION bin)
+ endif()
set ( building_binary "ON" )
else()
dd4hep_print ( "|++> ${tag} Skipped. No sources to be compiled [Use constraint]" )
@@ -1124,7 +1126,10 @@ function( dd4hep_add_plugin binary )
if ( "${enabled}" STREQUAL "OFF" )
dd4hep_skipmsg ( "${tag} DISBALED -- package is not built!" )
else()
- cmake_parse_arguments(ARG "" "" "SOURCES;GENERATED;LINK_LIBRARIES;INCLUDE_DIRS;USES;OPTIONAL;DEFINITIONS" ${ARGN})
+ cmake_parse_arguments(ARG "NOINSTALL" "" "SOURCES;GENERATED;LINK_LIBRARIES;INCLUDE_DIRS;USES;OPTIONAL;DEFINITIONS" ${ARGN})
+ if ( ${ARG_NOINSTALL} )
+ set(NOINSTALL NOINSTALL)
+ endif()
get_property(pkg_lib GLOBAL PROPERTY ${PKG}_LIBRARIES )
dd4hep_add_library( ${binary} building
PRINT ${tag}
@@ -1134,7 +1139,9 @@ function( dd4hep_add_plugin binary )
INCLUDE_DIRS ${ARG_INCLUDE_DIRS}
USES ${ARG_USES}
OPTIONAL "${ARG_OPTIONAL}"
- DEFINITIONS ${ARG_DEFINITIONS} )
+ DEFINITIONS ${ARG_DEFINITIONS}
+ ${NOINSTALL}
+ )
#
# Generate ROOTMAP if the plugin will be built:
if ( "${building}" STREQUAL "ON" )
--
GitLab