Changeset 19241 for trunk/Mars

Timestamp:

10/20/18 21:38:27 (6 years ago)

Author:

tbretz

Message:

No need anymore to install marslogo

File:

• trunk/Mars/CMakeLists.txt (modified) (5 diffs)

trunk/Mars/CMakeLists.txt

@@ -106 +106 @@
 # --------- config.h -------------
 
-#CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/config.h.in" "${PROJECT_BINARY_DIR}/config.h")
+CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/cmake/.rootrc.in" "${PROJECT_BINARY_DIR}/.rootrc")
+CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/cmake/rootlogon.C.in" "${PROJECT_BINARY_DIR}/rootlogon.C")
+
 #INCLUDE_DIRECTORIES("${PROJECT_BINARY_DIR}")
 
@@ -123 +125 @@
 # -lASImage -lMinuit -lHistPainter -lThread
 
-FIND_PACKAGE(ROOT REQUIRED COMPONENTS Gui Minuit)
+FIND_PACKAGE(ROOT REQUIRED COMPONENTS Gui Minuit ASImage HistPainter)
 
 
@@ -246 +248 @@
         ${ROOT_LIBRARIES})
 
+ADD_EXECUTABLE(showplot showplot.cc)
+ADD_EXECUTABLE(showlog  showplot.cc)
+ADD_EXECUTABLE(ceres    ceres.cc)
+TARGET_LINK_LIBRARIES(showplot mars ${ROOT_LIBRARIES})
+TARGET_LINK_LIBRARIES(showlog  mars ${ROOT_LIBRARIES})
+TARGET_LINK_LIBRARIES(ceres    mars ${ROOT_LIBRARIES})
+
 
 FOREACH(DIR ${DIRECTORIES})
@@ -252 +261 @@
 ENDFOREACH()
 
-ADD_CUSTOM_COMMAND(TARGET mars POST_BUILD
-        COMMAND ln -sf ${PROJECT_BINARY_DIR}/libmars.so ${PROJECT_SOURCE_DIR}/
-        COMMENT "Creating symlink for libmars.so to ${PROJECT_BINARY_DIR}")
+#ADD_CUSTOM_COMMAND(TARGET mars POST_BUILD
+#       COMMAND ln -sf ${PROJECT_BINARY_DIR}/libmars.so ${PROJECT_SOURCE_DIR}/
+#        COMMENT "Creating symlink for libmars.so to ${PROJECT_BINARY_DIR}")
 
 #---Create a shared library with geneated dictionary
@@ -277 +286 @@
 #INSTALL(TARGETS  mars           DESTINATION "${CMAKE_INSTALL_BINDIR}")
 INSTALL(TARGETS   mars         DESTINATION ".")
+INSTALL(TARGETS   showplot     DESTINATION ".")
+INSTALL(TARGETS   showlog      DESTINATION ".")
+INSTALL(TARGETS   ceres        DESTINATION ".")
 INSTALL(FILES     .rootrc      DESTINATION ".")
-INSTALL(FILES     marslogo.xpm DESTINATION ".")
 INSTALL(DIRECTORY macros       DESTINATION "." FILES_MATCHING PATTERN "*.C")
 INSTALL(DIRECTORY fact         DESTINATION "." FILES_MATCHING PATTERN "*.C")