Changeset 20060 for trunk

Timestamp:

04/12/21 11:36:55 (4 years ago)

Author:

tbretz

Message:

Allow compilation without v8, minor fixes to boost hacks, moved miniftmctrl to fact part

File:

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

trunk/FACT++/CMakeLists.txt

@@ -180 +180 @@
 FIND_PACKAGE(Readline REQUIRED)
 FIND_PACKAGE(Panel    REQUIRED)
-FIND_PACKAGE(V8       REQUIRED)
 FIND_PACKAGE(CCfits   REQUIRED)  # First as Cfitsio is a dependency
 FIND_PACKAGE(Cfitsio  REQUIRED)
 FIND_PACKAGE(OpenSSL  REQUIRED)  # Required for boost::asio::ssl
+
+FIND_PACKAGE(V8)
+IF (V8_INCLUDE_DIR AND V8_LIBRARY)
+        INCLUDE_DIRECTORIES(${V8_INCLUDE_DIR})
+ELSE()
+        MESSAGE(WARNING
+            " \n"
+            " libv8 not found!\n"
+            " dimctrl/dimserver disabled!")
+ENDIF()
 
 ENDIF(NOT TOOLS_ONLY)
@@ -247 +256 @@
         thread)
 
-IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND Boost_VERSION LESS 106000 AND NOT NO_BOOST_HACK)
+IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND Boost_VERSION VERSION_LESS 1.60 AND NOT NO_BOOST_HACK)
     MESSAGE(STATUS "Setting BOOST_REGEX_NO_EXTERNAL_TEMPLATES")
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBOOST_REGEX_NO_EXTERNAL_TEMPLATES=1")
@@ -756 +765 @@
 MANPAGE(zfits "")
 
+ADD_EXECUTABLE(fixfits src/fixfits.cc)
+TARGET_LINK_LIBRARIES(fixfits ${HELP++LIBS} ZLIB::ZLIB)
+MANPAGE(fixfits "FACT++ - fixfits - Fix the header of a none closed raw-data file")
+
 IF(NOT NO_ROOT)
    ADD_EXECUTABLE(calcsource src/calcsource.cc)
@@ -848 +861 @@
 MANPAGE(datalogger "")
 
-ADD_EXECUTABLE(dimctrl src/dimctrl.cc
-        src/StateMachineDimControl.cc
-        src/RemoteControl.cc
-        src/InterpreterV8.cc
-        src/DimState.cc)
-TARGET_LINK_LIBRARIES(dimctrl ${FACT++LIBS} Pointing ZLIB::ZLIB v8)
-MANPAGE(dimctrl "")
-
-ADD_CUSTOM_TARGET(dimserver ALL
-        COMMAND ln -sf dimctrl dimserver
-        COMMENT "Creating symlink for dimserver"
-        DEPENDS dimctrl)
+IF (V8_INCLUDE_DIR AND V8_LIBRARY)
+        ADD_EXECUTABLE(dimctrl src/dimctrl.cc
+                src/StateMachineDimControl.cc
+                src/RemoteControl.cc
+                src/InterpreterV8.cc
+                src/DimState.cc)
+        TARGET_LINK_LIBRARIES(dimctrl ${FACT++LIBS} Pointing ZLIB::ZLIB v8)
+        MANPAGE(dimctrl "")
+
+        ADD_CUSTOM_TARGET(dimserver ALL
+                COMMAND ln -sf dimctrl dimserver
+                COMMENT "Creating symlink for dimserver"
+                DEPENDS dimctrl)
+ENDIF()
 
 ADD_EXECUTABLE(drivectrl src/drivectrl.cc)
@@ -888 +903 @@
 MANPAGE(fscctrl "")
 
-ADD_EXECUTABLE(ftmctrl src/ftmctrl.cc src/HeadersFTM.cc)
-TARGET_LINK_LIBRARIES(ftmctrl ${FACT++LIBS})
-MANPAGE(ftmctrl "")
+ADD_EXECUTABLE(miniftmctrl src/miniftmctrl.cc)
+TARGET_LINK_LIBRARIES(miniftmctrl ${FACT++LIBS})
+MANPAGE(miniftmctrl "")
+
+IF(NOT FOUND_FAMOUS)
+    ADD_EXECUTABLE(ftmctrl src/ftmctrl.cc src/HeadersFTM.cc)
+    TARGET_LINK_LIBRARIES(ftmctrl ${FACT++LIBS})
+    MANPAGE(ftmctrl "")
+ELSE()
+    ADD_CUSTOM_TARGET(ftmctrl ALL
+        COMMAND ln -sf miniftmctrl ftmctrl
+        COMMENT "Creating symlink for ftmctrl"
+        DEPENDS miniftmctrl)
+ENDIF()
 
 ADD_EXECUTABLE(gcn src/gcn.cc)
@@ -1086 +1112 @@
         TARGET_LINK_LIBRARIES(ftuctrl ${FACT++LIBS})
         MANPAGE(ftuctrl "")
-
-        ADD_EXECUTABLE(miniftmctrl famous/src/miniftmctrl.cc)
-        TARGET_LINK_LIBRARIES(miniftmctrl ${FACT++LIBS})
-        MANPAGE(miniftmctrl "")
 
         ADD_EXECUTABLE(fpgaftmctrl famous/src/fpgaftmctrl.cc)