Fix compile on 18.04

nrackwit · Jan 17, 2022 · 00ebbac · 00ebbac
1 parent f115498
commit 00ebbac
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/indi-duino/CMakeLists.txt b/indi-duino/CMakeLists.txt
@@ -15,6 +15,12 @@ set (WEATHERRADIO_VERSION_MINOR 16)
 find_package(INDI REQUIRED)
 find_package(CURL REQUIRED)
 
+if (CMAKE_VERSION VERSION_LESS 3.12.0)
+set(CURL ${CURL_LIBRARIES})
+else()
+set(CURL CURL::libcurl)
+endif()
+
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h )
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/indi_duino.xml.cmake ${CMAKE_CURRENT_BINARY_DIR}/indi_duino.xml )
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/indi_weatherradio.xml.cmake ${CMAKE_CURRENT_BINARY_DIR}/indi_weatherradio.xml )
@@ -71,7 +77,7 @@ set(weatherradio_SRCS
    )
 
 add_executable(indi_weatherradio ${weatherradio_SRCS})
-target_link_libraries(indi_weatherradio ${INDI_LIBRARIES} CURL::libcurl)
+target_link_libraries(indi_weatherradio ${INDI_LIBRARIES} ${CURL})
 
 install(TARGETS indi_weatherradio RUNTIME DESTINATION bin)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/indi_weatherradio.xml DESTINATION ${INDI_DATA_DIR})

diff --git a/indi-starbook/CMakeLists.txt b/indi-starbook/CMakeLists.txt
@@ -13,6 +13,12 @@ find_package(INDI REQUIRED)
 find_package(CURL REQUIRED)
 find_package(Nova REQUIRED)
 
+if (CMAKE_VERSION VERSION_LESS 3.12.0)
+set(CURL ${CURL_LIBRARIES})
+else()
+set(CURL CURL::libcurl)
+endif()
+
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/indi_starbook_telescope.xml.cmake ${CMAKE_CURRENT_BINARY_DIR}/indi_starbook_telescope.xml)
 
@@ -29,7 +35,7 @@ set(indi_starbook_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/indi_starbook.cpp ${CMAKE_CUR
 
 add_executable(indi_starbook_telescope ${indi_starbook_SRCS} connectioncurl.cpp connectioncurl.h command_interface.cpp command_interface.h)
 
-target_link_libraries(indi_starbook_telescope ${INDI_LIBRARIES} ${NOVA_LIBRARIES} CURL::libcurl)
+target_link_libraries(indi_starbook_telescope ${INDI_LIBRARIES} ${NOVA_LIBRARIES} ${CURL})
 
 install(TARGETS indi_starbook_telescope RUNTIME DESTINATION bin)
 
@@ -53,7 +59,7 @@ if (INDI_BUILD_UNITTESTS)
 
     #   test shouldn't be so dependent on external libs, but here we are
     target_link_libraries(test_starbook
-            ${INDI_LIBRARIES} ${NOVA_LIBRARIES} CURL::libcurl ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}
+            ${INDI_LIBRARIES} ${NOVA_LIBRARIES} ${CURL} ${GTEST_BOTH_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}
             )
 
     add_test(run-tests test_starbook)

diff --git a/libapogee/CMakeLists.txt b/libapogee/CMakeLists.txt
@@ -25,6 +25,12 @@ find_package(USB1 REQUIRED)
 find_package(CURL REQUIRED)
 find_package(INDI REQUIRED)
 
+if (CMAKE_VERSION VERSION_LESS 3.12.0)
+set(CURL ${CURL_LIBRARIES})
+else()
+set(CURL CURL::libcurl)
+endif()
+
 include_directories( ${INDI_INCLUDE_DIR})
 include_directories( ${CMAKE_CURRENT_BINARY_DIR})
 include_directories( ${CMAKE_CURRENT_SOURCE_DIR})
@@ -49,7 +55,7 @@ add_library(apogee SHARED ${libapogee_SRCS})
 
 set_target_properties(apogee PROPERTIES VERSION ${APOGEE_VERSION} SOVERSION ${APOGEE_SOVERSION})
 
-target_link_libraries(apogee ${USB1_LIBRARIES} CURL::libcurl)
+target_link_libraries(apogee ${USB1_LIBRARIES} ${CURL})
 
 install(TARGETS apogee LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})