fix build on suse

Author: weatherhead99

CMakeLists.txt

@@ -2,7 +2,7 @@
 # CMakeLists.txt
 # top-level CMake input file
 # ----------------------------------------------------------------------------
-cmake_minimum_required(VERSION 3.12)
+cmake_minimum_required(VERSION 3.15)
 project(camera C CXX)
 
 
@@ -26,6 +26,7 @@ option(OUTPUT_TO_SRC_DIR "output binaries and libraries to source folder rather
 
 
 
+
 if(NOT CMAKE_BUILD_TYPE)
   message(STATUS "no build type specified defaulting to RelWithDebInfo")
   set(CMAKE_BUILD_TYPE RelWithDebInfo)
@@ -65,6 +66,31 @@ endif()
 
 find_package(Threads)
 
+
+#both emulator and camerad actually depend on cfitsio and CCfits (one only by header)
+#so we need to do those finds here, not in camerad/CMakeLists.
+
+#NOTE (by danw): strictly, the archon interface requires linking to cfitsio because
+#CCfits is included by archon.h. I'm not sure this is intentional.
+#Anyway, to reflect that I moved the public linkage of these packages down to the interface
+#target rather than camerad.
+
+#cfitsio has provided a cmake config file for quite a long time
+#on some systems where include files are not in the default place, this will still find them
+#if it fails, we fall back to camerad previous behaviour, manually finding the library file ONLY
+#(and not bothering about includes if they're not in the right place)
+
+
+#for cfitsio and CCfits  we now provide our own find module
+#this allows for systems with non-standard paths to
+#replace that find module without hacking our build system (e.g. fedora, suse, etc)
+
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+find_package(cfitsio REQUIRED)
+find_package(CCfits REQUIRED)
+
+
+
 #no need for absolute paths here, they are by default relative to ${CMAKE_CURRENT_LIST_DIR}
 add_subdirectory(utils)
 add_subdirectory(common)

camerad/CMakeLists.txt

@@ -7,6 +7,7 @@ cmake_minimum_required(VERSION 3.12)
 include_directories(${CMAKE_SOURCE_DIR}/utils)
 include_directories(${CMAKE_SOURCE_DIR}/common)
 
+
 # ----------------------------------------------------------------------------
 # Setup for appropriate hardware interface...
 #
@@ -17,6 +18,8 @@ include_directories(${CMAKE_SOURCE_DIR}/common)
 #   interface           target for interfacing to appropriate hardware
 # ----------------------------------------------------------------------------
 
+
+
 # ----------------------------------------------------------------------------
 # AstroCam ARC-64/66 PCI/e interfaces
 # ----------------------------------------------------------------------------
@@ -55,21 +58,18 @@ if (${INTERFACE_TYPE} STREQUAL "AstroCam")
     find_library(CARC_DEVICE "CArcDevice3.6" NAMES "libCArcDevice3.6.so" PATHS ${ARCAPI_DIR}/Release)
     find_library(CARC_FITS "CArcFitsFile3.6" NAMES "libCArcFitsFile3.6.so" PATHS ${ARCAPI_DIR}/Release)
 
+    add_library(interface STATIC ${INTERFACE_SOURCE})
+
+    
     # ----------------------------------------------------------------------------
     # STA Archon interfaces
     # ----------------------------------------------------------------------------
 
 elseif (${INTERFACE_TYPE} STREQUAL "Archon")
     message(STATUS "compiling for STA Archon")
-    set(INTERFACE_TARGET archon)
     add_definitions(-Wall -ansi -O1 -Wno-variadic-macros -std=c++17 -ggdb)
     add_definitions(-DSTA_ARCHON)
-    list(APPEND INTERFACE_SOURCE
-            "archon.cpp"
-    )
-    list(APPEND INTERFACE_INCLUDES
-            "${ARCHON_INCLUDE}"
-    )
+    list(APPEND INTERFACE_SOURCE "archon.cpp")
     add_library(interface STATIC "${INTERFACE_SOURCE}")
     if (${DETECTOR_TYPE} STREQUAL "Hxrg")
         message(STATUS "compiling for HXRG detector")
@@ -112,38 +112,15 @@ endif ()
 
 # Now add the defined interface target:
 #
-add_library(${INTERFACE_TARGET} ${INTERFACE_SOURCE})
-target_include_directories(${INTERFACE_TARGET} PUBLIC ${INTERFACE_INCLUDES})
+target_link_libraries(interface PUBLIC cfitsio CCfits)
 
 
-add_library(camera camera.cpp)
-
-# ----------------------------------------------------------------------------
-# External libraries, such as FITS, etc.
-# ----------------------------------------------------------------------------
-
-#cfitsio has provided a cmake config file for quite a long time
-#on some systems where include files are not in the default place, this will still find them
-#if it fails, we fall back to camerad previous behaviour, manually finding the library file ONLY
-#(and not bothering about includes if they're not in the right place)
-find_package(cfitsio)
-
-#the package file defines a cmake target rather than just the variables
-#that target will also have correct path to include files
-if(NOT TARGET cfitsio)
-  message(STATUS "cfitsio package file not found, maybe an old old system. Try finding library manually")
-  find_library(CFITS_LIB cfitsio NAMES libcfitsio PATHS /usr/local/lib)
-  add_library(cfitsio UNKNOWN IMPORTED)
-  set_target_properties(cfitsio PROPERTIES IMPORTED_LOCATION ${CFITS_LIB})
-endif()
-
-#for CCfits, we now provide our own find module
-#this allows for systems with non-standard paths to
-#replace that find module without hacking our build system (e.g. fedora, suse, etc)
 
+#Note from danw: I'm afraid camera.h technically includes CCfits, and so a public
+#dependency on those is needed
+add_library(camera camera.cpp)
+target_link_libraries(camera PUBLIC cfitsio CCfits)
 
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
-find_package(CCfits REQUIRED)
 
 find_package(Threads)
 add_executable(camerad camerad.cpp  ${INTERFACE_INCLUDES})
@@ -158,15 +135,14 @@ target_link_libraries(camerad
         logentry
         common
         utilities
-        ${INTERFACE_TARGET}
+	interface
         ${CMAKE_THREAD_LIBS_INIT}
 	cfitsio
 	CCfits
 )
 
-target_link_libraries(camerad ${CARC_BASE})
-target_link_libraries(camerad ${CARC_DEVICE})
-target_link_libraries(camerad ${CARC_FITS})
+target_link_libraries(camerad ${CARC_BASE} ${CARC_DEVICE} ${CARC_FITS})
+
 
 # ----------------------------------------------------------------------------
 # cURL is not used here, so it's not strictly required, but cfitsio can

camerad/archon.cpp

@@ -104,6 +104,17 @@ namespace Archon {
   }
   /**************** Archon::Interface::interface ******************************/
 
+
+  /***Note from danw: I couldn't get this to link without adding a dummy method here no idea why
+   **/
+
+  long Interface::power(std::string state_in, std::string& retstring)
+   {
+     return do_power(state_in, retstring);
+   }
+
+  
+  
   /***** Archon::Interface::do_power ******************************************/
   /**
    * @brief      set/get the power state
@@ -876,7 +887,7 @@ namespace Archon {
    *
    */
   long Interface::archon_cmd(std::string cmd) { // use this form when the calling
-    std::string reply;                          // function doesn't need to look at the reply
+   std::string reply;                          // function doesn't need to look at the reply
     return( archon_cmd(cmd, reply) );
   }
   long Interface::archon_cmd(std::string cmd, std::string &reply) {

cmake/FindCCfits.cmake

@@ -11,17 +11,27 @@ if(PKG_CONFIG_FOUND)
 
   #for compatibility with camera-interface build system, alias the target to CCFITS_LIB as well  
   add_library(CCfits ALIAS PkgConfig::CCFITS)
+  set(CCfits_FOUND TRUE)
+  
 else()
   message(VERBOSE "no pkg-config, trying to locate CCfits manually")
   find_library(CCFITS_LIB CCfits NAMES libCCfits PATHS /usr/local/lib)
   message(VERBOSE "CCFITS library: ${CCFITS_LIB}")
+
+  find_path(CCFITS_INCLUDE CCfits.h PATHS /usr/local/lib)
+  message(VERBOSE "CCFITS include: ${CCFITS_INCLUDE}")
+
+  get_filename_component(CCFITS_INCLUDE_DIR ${CCFITS_INCLUDE} DIRECTORY)
 
   #note that we don't even bother to find non-standard include paths.
   #neither did the previous camera-interface build system.
   #If you have a non-standard include path, your CCfits installation should
   #have included a pkg-config file and mentioned it, or you should have dropped in your
   #own find module here. Good luck.
-  add_library(CCfits UNKNOWN IMPORTED)
+  add_library(CCfits UNKNOWNN IMPORTED)
   set_target_properties(CCfits PROPERTIES IMPORTED_LOCATION ${CCFITS_LIB})
+  set_target_properties(CCfits PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${CCFITS_INCLUDE_DIR})
+
+  set(CCfits_FOUND TRUE)
 
 endif()

cmake/FindCCfits.cmake~

@@ -0,0 +1,4 @@
+#CCfits does by default provide a pkg-config recipe. Try this first, it's likely the best
+#however may not work on mac or windows
+
+find_package(PkgConfig QUIET)

cmake/Findcfitsio.cmake

@@ -0,0 +1,37 @@
+#cfitsio *sometimes* includes a CMake config file. This is the worst of all possible worlds.
+#On systems where it doesn't, it will fall back to this find module
+
+find_package(PkgConfig QUIET)
+if(PKG_CONFIG_FOUND)
+  message(VERBOSE "found pkg-config, trying to locate cfitsio using it")
+  pkg_check_modules(cfitsio cfitsio REQUIRED IMPORTED_TARGET)
+
+  add_library(cfitsio ALIAS PkgConfig::cfitsio)
+
+  get_target_property(PROP cfitsio INTERFACE_INCLUDE_DIRECTORIES)
+  message(VERBOSE "iid: ${PROP}")
+  message(VERBOSE "id: ${cfitsio_INCLUDE_DIRS}")
+
+
+  
+else()
+    message(VERBOSE "no pkg-config, trying to locate cfitsio manually")
+    find_library(CFITS_LIB cfitsio NAMES libcfitsio PATHS /usr/local/lib)
+    add_library(cfitsio UNKNOWN IMPORTED)
+    set_target_properties(cfitsio PROPERTIES IMPORTED_LOCATION ${CFITS_LIB})
+
+    find_path(FITSIO_INCLUDE fitsio.h)
+
+    message(VERBOSE "fitsio.h include location: ${FITSIO_INCLUDE}")
+
+    if(NOT FITSIO_INCLUDE)
+      message(FATAL_ERROR "could not find fitsio.h file, build cannot continue!")
+    endif()
+     
+    get_filename_component(CFITSIO_INCLUDE_DIR ${FITSIO_INCLUDE} DIRECTORY)
+
+    set_target_properties(cfitsio PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${CFITSIO_INCLUDE_DIR})
+    
+    set(cfitsio_FOUND TRUE)
+  
+endif()

cmake/Findcfitsio.cmake~

@@ -0,0 +1,2 @@
+#cfitsio *sometimes* includes a CMake config file. This is the worst of all possible worlds.
+#On systems where it doesn't, it will fall back to this find module

emulator/CMakeLists.txt

@@ -5,6 +5,7 @@
 cmake_minimum_required( VERSION 3.12 )
 add_definitions( -Wall -Wno-variadic-macros)
 
+
 include_directories( ${CMAKE_SOURCE_DIR}/utils 
                      ${CMAKE_SOURCE_DIR}/camerad 
                      ${CMAKE_SOURCE_DIR}/common )
@@ -20,8 +21,8 @@ if( ${INTERFACE_TYPE} STREQUAL "Archon" )
                 )
 
 add_library(${EMULATOR_TARGET} ${EMULATOR_SOURCE})
-
-target_include_directories(${EMULATOR_TARGET} PUBLIC ${PROJECT_INCL_DIR})
+target_link_libraries(${EMULATOR_TARGET} PUBLIC cfitsio CCfits)
+target_link_libraries(emulatorInterface PUBLIC cfitsio CCfits)
 
 add_executable(emulator emulator-server.cpp
         )