Changeset 19671 for trunk

Timestamp:

09/23/19 20:37:30 (5 years ago)

Author:

tbretz

Message:

This seems to be a minimalistic way to link the libraries -- I had problems on ihp-pc45 with the old scheme. Not sure why it doesn't know libm though.

File:

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

trunk/FACT++/CMakeLists.txt

@@ -382 +382 @@
         erfa/src/pap.c          erfa/src/fad03.c        erfa/src/pmp.c
         erfa/src/tr.c           erfa/src/falp03.c)
+TARGET_LINK_LIBRARIES(Pointing PUBLIC m)
 
 # ======================= libDim.so ======================
@@ -409 +410 @@
 #        src/DimSetup.h
         src/DimSetup.cc)
+TARGET_LINK_LIBRARIES(DimExtension PUBLIC
+        Boost::system)
 
 # ===================== libDim++.so ======================
@@ -425 +428 @@
         dim/src/discpp.cxx
         dim/src/tokenstring.cxx)
+TARGET_LINK_LIBRARIES(Dim++ PUBLIC Dim)
 
 # ================= libStateMachine.so ===================
@@ -458 +462 @@
 #       FACT.h ByteOrder.h
         src/DimWriteStatistics.h src/DimWriteStatistics.cc)
-TARGET_LINK_LIBRARIES(StateMachine OpenSSL::SSL)
+TARGET_LINK_LIBRARIES(StateMachine PUBLIC
+        readline ${CURSES_LIBRARIES} panel
+        Tools Time Dim++
+        Boost::regex
+        Boost::thread
+        Boost::filesystem
+        OpenSSL::SSL)
 
 ENDIF (NOT TOOLS_ONLY)
@@ -466 +476 @@
         src/Configuration.h src/Configuration.cc
         src/FACT.h src/FACT.cc)
-TARGET_LINK_LIBRARIES(Configuration
+TARGET_LINK_LIBRARIES(Configuration PUBLIC
         Boost::regex
         Boost::system
@@ -476 +486 @@
 ADD_LIBRARY(Time SHARED
         src/Time.h src/Time.cc)
-TARGET_LINK_LIBRARIES(Time ${NOVA_LIBRARY})
+TARGET_LINK_LIBRARIES(Time PUBLIC ${NOVA_LIBRARY})
 
 # ===================== libTools.so ======================
@@ -613 +623 @@
 # ********************************************************
 
-SET(FACT++LIBS
-        StateMachine Tools Configuration Time Dim++ Dim DimExtension
-        readline ${CURSES_LIBRARIES} panel Boost::thread) # HAVE_SQL
+SET(FACT++LIBS StateMachine Configuration DimExtension)
 
 # --------------------------------------------------------