Changeset 9cd3a4d in git for CMakeLists.txt

Timestamp:

Feb 23, 2017, 11:48:07 AM (8 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

8a4fba8

Parents:

abcacdb (diff), 9a3d132 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of github.com:delphes/delphes

File:

• CMakeLists.txt (modified) (3 diffs)

CMakeLists.txt

@@ -6 +6 @@
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
 
+# Set the runtime path of the libraries by default but allow to switch it off:
+option(SET_RPATH "Set runtime path of the ${project} libraries?" ON)
+IF(SET_RPATH)
+  # Set up the RPATH so executables find the libraries even when installed in non-default location
+  SET(CMAKE_MACOSX_RPATH 1)
+  SET(CMAKE_SKIP_BUILD_RPATH  FALSE)
+  SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) 
+  SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+
+  # Add the automatically determined parts of the RPATH which point to directories outside
+  # the build tree to the install RPATH
+  SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+
+  # the RPATH to be used when installing, but only if it's not a system directory
+  LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir)
+  IF(${isSystemDir} EQUAL -1)
+    SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+  ENDIF(${isSystemDir} EQUAL -1)
+ENDIF(SET_RPATH)
+    
 # Declare ROOT dependency
 find_package(ROOT COMPONENTS EG Eve Geom Gui GuiHtml GenVector Hist Physics Matrix Graf RIO Tree Gpad RGL MathCore)
@@ -36 +56 @@
 add_library(Delphes SHARED
   $<TARGET_OBJECTS:classes> 
-  $<TARGET_OBJECTS:display>
   $<TARGET_OBJECTS:modules> 
   $<TARGET_OBJECTS:ExRootAnalysis>
@@ -45 +64 @@
 )
 
+add_library(DelphesDisplay SHARED
+  $<TARGET_OBJECTS:classes>
+  $<TARGET_OBJECTS:display>
+  $<TARGET_OBJECTS:modules>
+  $<TARGET_OBJECTS:ExRootAnalysis>
+  $<TARGET_OBJECTS:fastjet>
+  $<TARGET_OBJECTS:tcl>
+  $<TARGET_OBJECTS:Hector>
+  $<TARGET_OBJECTS:PUPPI>
+)
+
 target_link_Libraries(Delphes ${ROOT_LIBRARIES} ${ROOT_COMPONENT_LIBRARIES})
+target_link_Libraries(DelphesDisplay ${ROOT_LIBRARIES} ${ROOT_COMPONENT_LIBRARIES})
 
-install(TARGETS Delphes DESTINATION lib)
+install(TARGETS Delphes DelphesDisplay DESTINATION lib)