Changeset 19241


Ignore:
Timestamp:
Oct 20, 2018, 9:38:27 PM (10 months ago)
Author:
tbretz
Message:
No need anymore to install marslogo
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Mars/CMakeLists.txt

    r19224 r19241  
    106106# --------- config.h -------------
    107107
    108 #CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/config.h.in" "${PROJECT_BINARY_DIR}/config.h")
     108CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/cmake/.rootrc.in" "${PROJECT_BINARY_DIR}/.rootrc")
     109CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/cmake/rootlogon.C.in" "${PROJECT_BINARY_DIR}/rootlogon.C")
     110
    109111#INCLUDE_DIRECTORIES("${PROJECT_BINARY_DIR}")
    110112
     
    123125# -lASImage -lMinuit -lHistPainter -lThread
    124126
    125 FIND_PACKAGE(ROOT REQUIRED COMPONENTS Gui Minuit)
     127FIND_PACKAGE(ROOT REQUIRED COMPONENTS Gui Minuit ASImage HistPainter)
    126128
    127129
     
    246248        ${ROOT_LIBRARIES})
    247249
     250ADD_EXECUTABLE(showplot showplot.cc)
     251ADD_EXECUTABLE(showlog  showplot.cc)
     252ADD_EXECUTABLE(ceres    ceres.cc)
     253TARGET_LINK_LIBRARIES(showplot mars ${ROOT_LIBRARIES})
     254TARGET_LINK_LIBRARIES(showlog  mars ${ROOT_LIBRARIES})
     255TARGET_LINK_LIBRARIES(ceres    mars ${ROOT_LIBRARIES})
     256
    248257
    249258FOREACH(DIR ${DIRECTORIES})
     
    252261ENDFOREACH()
    253262
    254 ADD_CUSTOM_COMMAND(TARGET mars POST_BUILD
    255         COMMAND ln -sf ${PROJECT_BINARY_DIR}/libmars.so ${PROJECT_SOURCE_DIR}/
    256         COMMENT "Creating symlink for libmars.so to ${PROJECT_BINARY_DIR}")
     263#ADD_CUSTOM_COMMAND(TARGET mars POST_BUILD
     264#       COMMAND ln -sf ${PROJECT_BINARY_DIR}/libmars.so ${PROJECT_SOURCE_DIR}/
     265#        COMMENT "Creating symlink for libmars.so to ${PROJECT_BINARY_DIR}")
    257266
    258267#---Create a shared library with geneated dictionary
     
    277286#INSTALL(TARGETS  mars           DESTINATION "${CMAKE_INSTALL_BINDIR}")
    278287INSTALL(TARGETS   mars         DESTINATION ".")
     288INSTALL(TARGETS   showplot     DESTINATION ".")
     289INSTALL(TARGETS   showlog      DESTINATION ".")
     290INSTALL(TARGETS   ceres        DESTINATION ".")
    279291INSTALL(FILES     .rootrc      DESTINATION ".")
    280 INSTALL(FILES     marslogo.xpm DESTINATION ".")
    281292INSTALL(DIRECTORY macros       DESTINATION "." FILES_MATCHING PATTERN "*.C")
    282293INSTALL(DIRECTORY fact         DESTINATION "." FILES_MATCHING PATTERN "*.C")
Note: See TracChangeset for help on using the changeset viewer.