A bunch of CMake fixes (#769)

* Various CMake improvements
* Fixes for CI

Author: graebm

.github/workflows/ci.yml

@@ -43,7 +43,7 @@ env:
 
 jobs:
   linux-compat:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         image:
@@ -447,7 +447,7 @@ jobs:
           python3 ./devicedefender/script/DDTestRun.py mqtt5
   # Runs the samples and ensures that everything is working
   linux-smoke-tests:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
     permissions:

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.9)
+cmake_minimum_required(VERSION 3.9...3.31)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 include(AwsGetVersion)
@@ -14,33 +14,11 @@ option(BUILD_DEPS "Builds aws common runtime dependencies as part of build. Turn
 option(USE_EXTERNAL_DEPS_SOURCES "Use dependencies provided by add_subdirectory command" OFF)
 option(BUILD_SAMPLES "(DEPRECATED) Build samples as part of the build" OFF)
 
-if (DEFINED CMAKE_PREFIX_PATH)
-    file(TO_CMAKE_PATH "${CMAKE_PREFIX_PATH}" CMAKE_PREFIX_PATH)
-endif()
-
-if (DEFINED CMAKE_INSTALL_PREFIX)
-    file(TO_CMAKE_PATH "${CMAKE_INSTALL_PREFIX}" CMAKE_INSTALL_PREFIX)
-endif()
-
 if (NOT CMAKE_CXX_STANDARD)
     set(CMAKE_CXX_STANDARD 11)
 endif()
 
-if (UNIX AND NOT APPLE)
-    include(GNUInstallDirs)
-elseif(NOT DEFINED CMAKE_INSTALL_LIBDIR)
-    set(CMAKE_INSTALL_LIBDIR "lib")
-endif()
-
-if (${CMAKE_INSTALL_LIBDIR} STREQUAL "lib64")
-    set(FIND_LIBRARY_USE_LIB64_PATHS true)
-endif()
-
-# This is required in order to append /lib/cmake to each element in CMAKE_PREFIX_PATH
-set(AWS_MODULE_DIR "/${CMAKE_INSTALL_LIBDIR}/cmake")
-string(REPLACE ";" "${AWS_MODULE_DIR};" AWS_MODULE_PATH "${CMAKE_PREFIX_PATH}${AWS_MODULE_DIR}")
-# Append that generated list to the module search path
-list(APPEND CMAKE_MODULE_PATH ${AWS_MODULE_PATH})
+include(GNUInstallDirs)
 
 if (NOT CMAKE_BUILD_TYPE)
     if (NOT WIN32)
@@ -92,6 +70,9 @@ else()
 
         set(IN_SOURCE_BUILD ON)
     else()
+        # this is required so we can use aws-c-common's CMake modules
+        find_package(aws-c-common REQUIRED)
+
         set(IN_SOURCE_BUILD OFF)
     endif()
 

crt/aws-c-iot

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.9)
+cmake_minimum_required(VERSION 3.9...3.31)
 # note: cxx-17 requires cmake 3.8, cxx-20 requires cmake 3.12
 project(mqtt_connect CXX)
 

crt/aws-crt-cpp

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.9)
+cmake_minimum_required(VERSION 3.9...3.31)
 # note: cxx-17 requires cmake 3.8, cxx-20 requires cmake 3.12
 project(mqtt_publish CXX)
 

deviceadvisor/tests/mqtt_connect/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.9)
+cmake_minimum_required(VERSION 3.9...3.31)
 # note: cxx-17 requires cmake 3.8, cxx-20 requires cmake 3.12
 project(mqtt_subscribe CXX)
 

deviceadvisor/tests/mqtt_publish/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.9)
+cmake_minimum_required(VERSION 3.9...3.31)
 # note: cxx-17 requires cmake 3.8, cxx-20 requires cmake 3.12
 project(shadow_update CXX)
 
@@ -23,6 +23,4 @@ endif ()
 find_package(aws-crt-cpp REQUIRED)
 find_package(IotShadow-cpp REQUIRED)
 
-install(TARGETS ${PROJECT_NAME} DESTINATION bin)
-
 target_link_libraries(${PROJECT_NAME} PRIVATE AWS::aws-crt-cpp AWS::IotShadow-cpp)

deviceadvisor/tests/mqtt_subscribe/CMakeLists.txt

@@ -1,26 +1,12 @@
-cmake_minimum_required(VERSION 3.9)
+cmake_minimum_required(VERSION 3.9...3.31)
 
 project(IotDeviceDefender-cpp LANGUAGES CXX VERSION ${SIMPLE_VERSION})
 
-set(RUNTIME_DIRECTORY bin)
-
-if (UNIX AND NOT APPLE)
-    include(GNUInstallDirs)
-elseif(NOT DEFINED CMAKE_INSTALL_LIBDIR)
-    set(CMAKE_INSTALL_LIBDIR "lib")
-
-    if (${CMAKE_INSTALL_LIBDIR} STREQUAL "lib64")
-        set(FIND_LIBRARY_USE_LIB64_PATHS true)
-    endif()
-endif()
-
 set(GENERATED_ROOT_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated")
 set(GENERATED_INCLUDE_DIR "${GENERATED_ROOT_DIR}/include")
 set(GENERATED_CONFIG_HEADER "${GENERATED_INCLUDE_DIR}/aws/iotdevicedefender/Config.h")
 configure_file(include/aws/iotdevicedefender/Config.h.in ${GENERATED_CONFIG_HEADER} @ONLY)
 
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_PREFIX_PATH}/${CMAKE_INSTALL_LIBDIR}/cmake")
-
 if (NOT CMAKE_CXX_STANDARD)
     set(CMAKE_CXX_STANDARD 11)
 endif()
@@ -75,7 +61,7 @@ if (BUILD_SHARED_LIBS)
             NAMELINK_SKIP
             COMPONENT Runtime
             RUNTIME
-            DESTINATION ${RUNTIME_DIRECTORY}
+            DESTINATION ${CMAKE_INSTALL_BINDIR}
             COMPONENT Runtime)
 
     install(TARGETS IotDeviceDefender-cpp
@@ -104,7 +90,7 @@ endif()
 
 target_link_libraries(IotDeviceDefender-cpp IotDeviceCommon-cpp)
 
-install(FILES ${AWS_IOTDEVICEDEFENDER_HEADERS} DESTINATION "include/aws/iotdevicedefender/" COMPONENT Development)
+install(FILES ${AWS_IOTDEVICEDEFENDER_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/iotdevicedefender/" COMPONENT Development)
 
 if (BUILD_SHARED_LIBS)
     set(TARGET_DIR "shared")
@@ -121,7 +107,7 @@ if (DEFINED SIMPLE_VERSION)
 endif()
 
 install(EXPORT "IotDeviceDefender-cpp-targets"
-        DESTINATION "${CMAKE_INSTALL_LIBDIR}/IotDeviceDefender-cpp/cmake/${TARGET_DIR}"
+        DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/IotDeviceDefender-cpp/${TARGET_DIR}"
         NAMESPACE AWS::
         COMPONENT Development)
 
@@ -130,7 +116,7 @@ configure_file("cmake/iotdevicedefender-cpp-config.cmake"
         @ONLY)
 
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/iotdevicedefender-cpp-config.cmake"
-        DESTINATION "${CMAKE_INSTALL_LIBDIR}/IotDeviceDefender-cpp/cmake/"
+        DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/IotDeviceDefender-cpp/"
         COMPONENT Development)
 
 if (BUILD_TESTING)

deviceadvisor/tests/shadow_update/CMakeLists.txt

@@ -1,26 +1,12 @@
-cmake_minimum_required(VERSION 3.9)
+cmake_minimum_required(VERSION 3.9...3.31)
 
 project(Discovery-cpp LANGUAGES CXX VERSION ${SIMPLE_VERSION})
 
-set(RUNTIME_DIRECTORY bin)
-
-if (UNIX AND NOT APPLE)
-    include(GNUInstallDirs)
-elseif(NOT DEFINED CMAKE_INSTALL_LIBDIR)
-    set(CMAKE_INSTALL_LIBDIR "lib")
-
-    if (${CMAKE_INSTALL_LIBDIR} STREQUAL "lib64")
-        set(FIND_LIBRARY_USE_LIB64_PATHS true)
-    endif()
-endif()
-
 set(GENERATED_ROOT_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated")
 set(GENERATED_INCLUDE_DIR "${GENERATED_ROOT_DIR}/include")
 set(GENERATED_CONFIG_HEADER "${GENERATED_INCLUDE_DIR}/aws/discovery/Config.h")
 configure_file(include/aws/discovery/Config.h.in ${GENERATED_CONFIG_HEADER} @ONLY)
 
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_PREFIX_PATH}/${CMAKE_INSTALL_LIBDIR}/cmake")
-
 if (NOT CMAKE_CXX_STANDARD)
     set(CMAKE_CXX_STANDARD 11)
 endif()
@@ -75,7 +61,7 @@ if (BUILD_SHARED_LIBS)
             NAMELINK_SKIP
             COMPONENT Runtime
             RUNTIME
-            DESTINATION ${RUNTIME_DIRECTORY}
+            DESTINATION ${CMAKE_INSTALL_BINDIR}
             COMPONENT Runtime)
 
     install(TARGETS Discovery-cpp
@@ -103,7 +89,7 @@ endif()
 
 target_link_libraries(Discovery-cpp ${DEP_AWS_LIBS})
 
-install(FILES ${AWS_DISCOVERY_HEADERS} DESTINATION "include/aws/discovery/" COMPONENT Development)
+install(FILES ${AWS_DISCOVERY_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/aws/discovery/" COMPONENT Development)
 
 if (BUILD_SHARED_LIBS)
     set (TARGET_DIR "shared")
@@ -120,7 +106,7 @@ if (DEFINED SIMPLE_VERSION)
 endif()
 
 install(EXPORT "Discovery-cpp-targets"
-        DESTINATION "${CMAKE_INSTALL_LIBDIR}/Discovery-cpp/cmake/${TARGET_DIR}"
+        DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/Discovery-cpp/${TARGET_DIR}"
         NAMESPACE AWS::
         COMPONENT Development)
 
@@ -129,5 +115,5 @@ configure_file("cmake/discovery-cpp-config.cmake"
         @ONLY)
 
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/discovery-cpp-config.cmake"
-        DESTINATION "${CMAKE_INSTALL_LIBDIR}/Discovery-cpp/cmake/"
+        DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/Discovery-cpp/"
         COMPONENT Development)