Changeset 19297

Timestamp:

10/24/18 22:01:05 (6 years ago)

Author:

tbretz

Message:

Separated lib and dictionary path, properly print include path of nova

File:

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

trunk/Mars/CMakeLists.txt

@@ -56 +56 @@
 # Inlclude the main source AND build dir itself
 #SET(CMAKE_INCLUDE_CURRENT_DIR ON)
-SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/dictionary)
+SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
 
 # =========== help2man ============
@@ -68 +68 @@
 # ============= libnova ==============
 
-PKG_CHECK_MODULES(Nova Nova)
+PKG_CHECK_MODULES(Nova QUIET Nova)
 
 # Try to locate the package in the default path
@@ -83 +83 @@
 
 # handle success
-IF(NOVA_FOUND AND NOT NOVA_FIND_QUIETLY)
-    MESSAGE(STATUS "Found Nova ${NOVA_LIBRARY} in ${NOVA_INCLUDE_DIR}")
-ENDIF()
+FIND_PACKAGE_MESSAGE(NovaInc "Found Nova headers in ${NOVA_INCLUDE_DIR}" "[${NOVA_LIBRARY}][${NOVA_INCLUDE_DIR}]")
 
 
@@ -106 +104 @@
          -DPACKAGE_VERSION=\\\"1.0\\\" -DREVISION=\\\"1.0\\\" \
          -DPACKAGE_NAME=\\\"MARS\\\" -DHAVE_ZLIB")
-
 
 # --------- ROOT -------------
@@ -165 +162 @@
 
 MACRO(SRCFILES subdir)
+
+        MESSAGE(STATUS "Reading source list from ${DIR}/Makefile")
 
         EXECUTE_PROCESS(COMMAND
@@ -269 +268 @@
 
 FOREACH(DIR ${DIRECTORIES})
-        MESSAGE(STATUS "Reading source list from ${DIR}/Makefile")
         SRCFILES(${DIR})
 ENDFOREACH()
@@ -304 +302 @@
 INSTALL(TARGETS   ceres        DESTINATION ".")
 INSTALL(FILES     .rootrc      DESTINATION ".")
+INSTALL(DIRECTORY lib          DESTINATION ".")
 INSTALL(DIRECTORY macros       DESTINATION "." FILES_MATCHING PATTERN "*.C")
 INSTALL(DIRECTORY fact         DESTINATION "." FILES_MATCHING PATTERN "*.C")