Changeset 19216 for trunk

Timestamp:

09/07/18 12:06:04 (6 years ago)

Author:

tbretz

Message:

Nova needs to be linked with Time already, skip uknown pragmas (mainly for gcc)

File:

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

trunk/FACT++/CMakeLists.txt

@@ -185 +185 @@
         "${CMAKE_CXX_FLAGS} -Wall -Winit-self -Wpointer-arith \
          -Wcast-align -Wformat=2 -Woverloaded-virtual \
-         -Wnon-virtual-dtor -Wshadow") # -Wextra
+         -Wnon-virtual-dtor -Wshadow -Wno-unknown-pragmas") # -Wextra
 
 # FIXME: Move that to config.h.in
@@ -393 +393 @@
 ADD_LIBRARY(Time SHARED
         src/Time.h src/Time.cc)
-#TARGET_LINK_LIBRARIES(Time)# ${NOVA_LIBRARY})
+TARGET_LINK_LIBRARIES(Time ${NOVA_LIBRARY})
 
 # ===================== libTools.so ======================
@@ -497 +497 @@
 
 ADD_EXECUTABLE(calcsource src/calcsource.cc)
-TARGET_LINK_LIBRARIES(calcsource ${HELP++LIBS} ${ROOT_LIBRARIES} ${NOVA_LIBRARY})
+TARGET_LINK_LIBRARIES(calcsource ${HELP++LIBS} ${ROOT_LIBRARIES})
 MANPAGE(calcsource "")
 
@@ -507 +507 @@
 
 ADD_EXECUTABLE(makeplots src/makeplots.cc)
-TARGET_LINK_LIBRARIES(makeplots  ${HELP++LIBS} ${ROOT_LIBRARIES} ${NOVA_LIBRARY})
+TARGET_LINK_LIBRARIES(makeplots  ${HELP++LIBS} ${ROOT_LIBRARIES})
 MANPAGE(makeplots "")
 
 ADD_EXECUTABLE(makedata src/makedata.cc)
-TARGET_LINK_LIBRARIES(makedata ${HELP++LIBS} ${NOVA_LIBRARY})
+TARGET_LINK_LIBRARIES(makedata ${HELP++LIBS})
 MANPAGE(makedata "")
 
 ADD_EXECUTABLE(makeschedule src/makeschedule.cc)
-TARGET_LINK_LIBRARIES(makeschedule ${HELP++LIBS} ${NOVA_LIBRARY})
+TARGET_LINK_LIBRARIES(makeschedule ${HELP++LIBS})
 MANPAGE(makeschedule "")
 
@@ -568 +568 @@
         src/InterpreterV8.cc
         src/DimState.cc)
-TARGET_LINK_LIBRARIES(dimctrl ${FACT++LIBS} ${NOVA_LIBRARY} Pointing ZLIB::ZLIB v8)
+TARGET_LINK_LIBRARIES(dimctrl ${FACT++LIBS} Pointing ZLIB::ZLIB v8)
 MANPAGE(dimctrl "")
 
@@ -577 +577 @@
 
 ADD_EXECUTABLE(drivectrl src/drivectrl.cc)
-TARGET_LINK_LIBRARIES(drivectrl ${FACT++LIBS} ${NOVA_LIBRARY} Pointing)
+TARGET_LINK_LIBRARIES(drivectrl ${FACT++LIBS} Pointing)
 MANPAGE(drivectrl "")
 
 ADD_EXECUTABLE(evtserver src/evtserver.cc)
-TARGET_LINK_LIBRARIES(evtserver ${FACT++LIBS} ${NOVA_LIBRARY} ZLIB::ZLIB)
+TARGET_LINK_LIBRARIES(evtserver ${FACT++LIBS} ZLIB::ZLIB)
 MANPAGE(evtserver "")
 
@@ -608 +608 @@
 
 ADD_EXECUTABLE(gcn src/gcn.cc)
-TARGET_LINK_LIBRARIES(gcn ${FACT++LIBS} ${NOVA_LIBRARY} Qt4::QtXml)
+TARGET_LINK_LIBRARIES(gcn ${FACT++LIBS} Qt4::QtXml)
 MANPAGE(gcn "")
 
@@ -664 +664 @@
 
 ADD_EXECUTABLE(smartfact src/smartfact.cc)
-TARGET_LINK_LIBRARIES(smartfact ${FACT++LIBS} ${NOVA_LIBRARY}) # HAVE_NOVA
+TARGET_LINK_LIBRARIES(smartfact ${FACT++LIBS}) # HAVE_NOVA
 MANPAGE(smartfact "")