Changeset 19297


Ignore:
Timestamp:
Oct 24, 2018, 10:01:05 PM (5 months ago)
Author:
tbretz
Message:
Separated lib and dictionary path, properly print include path of nova
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Mars/CMakeLists.txt

    r19294 r19297  
    5656# Inlclude the main source AND build dir itself
    5757#SET(CMAKE_INCLUDE_CURRENT_DIR ON)
    58 SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/dictionary)
     58SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
    5959
    6060# =========== help2man ============
     
    6868# ============= libnova ==============
    6969
    70 PKG_CHECK_MODULES(Nova Nova)
     70PKG_CHECK_MODULES(Nova QUIET Nova)
    7171
    7272# Try to locate the package in the default path
     
    8383
    8484# handle success
    85 IF(NOVA_FOUND AND NOT NOVA_FIND_QUIETLY)
    86     MESSAGE(STATUS "Found Nova ${NOVA_LIBRARY} in ${NOVA_INCLUDE_DIR}")
    87 ENDIF()
     85FIND_PACKAGE_MESSAGE(NovaInc "Found Nova headers in ${NOVA_INCLUDE_DIR}" "[${NOVA_LIBRARY}][${NOVA_INCLUDE_DIR}]")
    8886
    8987
     
    106104         -DPACKAGE_VERSION=\\\"1.0\\\" -DREVISION=\\\"1.0\\\" \
    107105         -DPACKAGE_NAME=\\\"MARS\\\" -DHAVE_ZLIB")
    108 
    109106
    110107# --------- ROOT -------------
     
    165162
    166163MACRO(SRCFILES subdir)
     164
     165        MESSAGE(STATUS "Reading source list from ${DIR}/Makefile")
    167166
    168167        EXECUTE_PROCESS(COMMAND
     
    269268
    270269FOREACH(DIR ${DIRECTORIES})
    271         MESSAGE(STATUS "Reading source list from ${DIR}/Makefile")
    272270        SRCFILES(${DIR})
    273271ENDFOREACH()
     
    304302INSTALL(TARGETS   ceres        DESTINATION ".")
    305303INSTALL(FILES     .rootrc      DESTINATION ".")
     304INSTALL(DIRECTORY lib          DESTINATION ".")
    306305INSTALL(DIRECTORY macros       DESTINATION "." FILES_MATCHING PATTERN "*.C")
    307306INSTALL(DIRECTORY fact         DESTINATION "." FILES_MATCHING PATTERN "*.C")
Note: See TracChangeset for help on using the changeset viewer.