Changeset b309507 in git

Timestamp:

Nov 23, 2016, 6:11:54 PM (8 years ago)

Author:

GitHub <noreply@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

781e3118

Parents:

78a2d4c (diff), 0f5bf9d (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.

git-author:

Michele Selvaggi <michele.selvaggi@…> (11/23/16 18:11:54)

git-committer:

GitHub <noreply@…> (11/23/16 18:11:54)

Message:

Merge pull request #35 from jlingema/b_3.4.0

Add missing install targets

Files:

• classes/CMakeLists.txt (modified) (1 diff)
• display/CMakeLists.txt (modified) (1 diff)
• external/ExRootAnalysis/CMakeLists.txt (modified) (1 diff)
• modules/CMakeLists.txt (modified) (1 diff)

classes/CMakeLists.txt

@@ -21 +21 @@
 # install public headers
 install(FILES ${headers} DESTINATION include/classes)
+
+# install pcms if they are created
+if (${ROOT_VERSION} GREATER 6)
+  install(FILES
+      ${PROJECT_BINARY_DIR}/classes/libClassesDict_rdict.pcm
+      DESTINATION lib)
+endif()

display/CMakeLists.txt

@@ -12 +12 @@
 
 add_library(display OBJECT ${sources} DisplayDict.cxx)
+
+# install pcms if they are created
+if (${ROOT_VERSION} GREATER 6)
+  install(FILES
+      ${PROJECT_BINARY_DIR}/external/DisplayDict_rdict.pcm
+      DESTINATION lib)
+endif()

external/ExRootAnalysis/CMakeLists.txt

@@ -13 +13 @@
 
 # install headers needed by public Delphes headers to include/
-install(FILES ExRootTask.h ExRootConfReader.h DESTINATION include/ExRootAnalysis)
+install(FILES ExRootTask.h ExRootConfReader.h ExRootTreeWriter.h ExRootTreeBranch.h
+        DESTINATION include/ExRootAnalysis)
+
+# install all LinkDef files into the same folder to ease user environment
+install(FILES ExRootAnalysisLinkDef.h DESTINATION include)
+
+# install pcms if they are created
+if (${ROOT_VERSION} GREATER 6)
+  install(FILES
+      ${PROJECT_BINARY_DIR}/external/ExRootAnalysis/libExRootAnalysisDict_rdict.pcm
+      DESTINATION lib)
+endif()

modules/CMakeLists.txt

@@ -20 +20 @@
 
 # install public headers
-install(FILES Delphes.h DESTINATION include/modules)
+install(FILES Delphes.h
+        DESTINATION include/modules
+)
+
+# install pcms if they are created
+if (${ROOT_VERSION} GREATER 6)
+  install(FILES
+      ${PROJECT_BINARY_DIR}/modules/libModulesDict_rdict.pcm
+      ${PROJECT_BINARY_DIR}/modules/libFastJetDict_rdict.pcm
+      DESTINATION lib)
+endif()