Changeset e83faed in git

Timestamp:

Feb 13, 2017, 11:18:49 AM (8 years ago)

Author:

GitHub <noreply@…>

Parents:

50ed7575 (diff), 66b8143 (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:

Joshua Ellis <josh@…> (02/13/17 11:18:49)

git-committer:

GitHub <noreply@…> (02/13/17 11:18:49)

Message:

Merge 66b81436efabe0196aa5ccd25cf20cea05d3c884 into 50ed7575a80ff18ef50d045c536cdf826ec6497e

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

@@ -22 +22 @@
 install(FILES ${headers} DESTINATION include/classes)
 
+# install all LinkDef files into the same folder to ease user environment
+install(FILES ClassesLinkDef.h DESTINATION include)
+
 # install pcms if they are created
 if (${ROOT_VERSION} GREATER 6)

display/CMakeLists.txt

@@ -13 +13 @@
 add_library(display OBJECT ${sources} DisplayDict.cxx)
 
+# install public headers
+install(FILES ${headers} DESTINATION include/display)
+
+# install all LinkDef files into the same folder to ease user environment
+install(FILES DisplayLinkDef.h DESTINATION include)
+
 # install pcms if they are created
 if (${ROOT_VERSION} GREATER 6)

external/ExRootAnalysis/CMakeLists.txt

@@ -13 +13 @@
 
 # install headers needed by public Delphes headers to include/
-install(FILES
-  ExRootClassifier.h
-  ExRootConfReader.h
-  ExRootFilter.h
-  ExRootProgressBar.h
-  ExRootResult.h
-  ExRootTask.h
-  ExRootTreeBranch.h
-  ExRootTreeReader.h
-  ExRootTreeWriter.h
-  ExRootUtilities.h
-  DESTINATION include/ExRootAnalysis)
+install(FILES ${headers} DESTINATION include/ExRootAnalysis)
 
 # install all LinkDef files into the same folder to ease user environment

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