Changeset 19883 for trunk/FACT++

Timestamp:

12/11/19 20:09:33 (5 years ago)

Author:

tbretz

Message:

Added spectrum program, added support for binary resources linked into the executable, define HAVE_ROOT only if ROOT was found, look for GNU Highlight, set HAVE_HIGHLIGHT if found.

File:

• trunk/FACT++/CMakeLists.txt (modified) (6 diffs)

trunk/FACT++/CMakeLists.txt

@@ -166 +166 @@
 FIND_PACKAGE(Nova     REQUIRED)
 
+FIND_PACKAGE(Highlight)
+IF (HIGHLIGHT_FOUND)
+   ADD_DEFINITIONS(-DHAVE_HIGHLIGHT)
+ENDIF()
+
+
 #INCLUDE_DIRECTORIES("/usr/include/mysql")
 # dbus-1 dbus-glib-1
@@ -306 +312 @@
    SET(ROOTVER ${ROOT_VERSION} CACHE INTERNAL "Internal variable to check for consistency of root version")
 
+   ADD_DEFINITIONS(-DHAVE_ROOT)
+
 ENDIF(NOT NO_ROOT AND NOT VIEWER_ONLY)
 
@@ -361 +369 @@
         "${CMAKE_CXX_FLAGS} \
          -D_REENTRANT -D__LINUX__ \
-         -DHAVE_ZLIB -DHAVE_ROOT -DHAVE_V8 -DHAVE_SQL -DHAVE_NOVA -DHAVE_FITS -DPRESET_OBSERVATORY=k${OBSERVATORY} \
+         -DHAVE_ZLIB -DHAVE_V8 -DHAVE_SQL -DHAVE_NOVA -DHAVE_FITS -DPRESET_OBSERVATORY=k${OBSERVATORY} \
          -DMARSVER=\\\"${VERSION}\\\" \
          -DPACKAGE_VERSION=\\\"${VERSION}\\\" \
@@ -559 +567 @@
 
 MACRO(MANPAGE program description)
-# https://samthursfield.wordpress.com/2015/11/21/cmake-dependencies-between-targets-and-files-and-custom-commands/
-IF (HELP2MAN_EXECUTABLE AND ROFF2HTML_EXECUTABLE AND ROFF2PDF_EXECUTABLE AND GROFF_EXECUTABLE)
+   # https://samthursfield.wordpress.com/2015/11/21/cmake-dependencies-between-targets-and-files-and-custom-commands/
+   IF (HELP2MAN_EXECUTABLE AND ROFF2HTML_EXECUTABLE AND ROFF2PDF_EXECUTABLE AND GROFF_EXECUTABLE)
         ADD_CUSTOM_COMMAND(
                 OUTPUT
@@ -587 +595 @@
 
         INSTALL(FILES ${PROJECT_BINARY_DIR}/man1/${program}.1 DESTINATION "${CMAKE_INSTALL_MANDIR}/man1")
-ENDIF()
+   ENDIF()
 ENDMACRO()
 
+
+# ********************************************************
+# ********************* Resources ************************
+# ********************************************************
+
+FILE(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/res)
+
+FUNCTION(ADD_RESOURCES)
+    FOREACH(resource ${ARGV})
+        STRING(MAKE_C_IDENTIFIER ${resource} identifier)
+        ADD_CUSTOM_COMMAND(
+            OUTPUT  "${PROJECT_BINARY_DIR}/res/${identifier}.o"
+            COMMAND ${CMAKE_LINKER} --relocatable --format binary --output "${PROJECT_BINARY_DIR}/res/${identifier}.o" ${resource}
+            DEPENDS ${resource}
+            WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
+        )
+    ENDFOREACH()
+ENDFUNCTION()
 
 
@@ -663 +689 @@
    MANPAGE(calcsourcemc "")
 ENDIF()
+
+ADD_EXECUTABLE(spectrum src/spectrum.cc src/WindowLog.cc res/spectrum_data_sql.o res/spectrum_simulation_sql.o res/spectrum_analysis_sql.o)
+TARGET_LINK_LIBRARIES(spectrum Threads::Threads ${CURSES_LIBRARIES} ${HIGHLIGHT_LIBRARY} ${HELP++LIBS} ${ROOT_LIBRARIES})
+ADD_RESOURCES(spectrum/analysis.sql spectrum/data.sql spectrum/simulation.sql)
+MANPAGE(spectrum "")
 
 ADD_EXECUTABLE(getevent src/getevent.cc)