Merge pull request #2491 from mavlink/pr-fix-cmake-openssl

Find openssl with older cmake version
mavlink · Jan 10, 2025 · 8c21685 · 8c21685
2 parents 6f0b1e3 + 1f9111f
commit 8c21685
Show file tree

Hide file tree

Showing 12 changed files with 802 additions and 5 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -191,7 +191,7 @@ jobs:
             cmake -Bthird_party/mavlink/build -Sthird_party/mavlink
             sudo cmake --build third_party/mavlink/build
       - name: configure
-        run: cmake -DSUPERBUILD=OFF -DHUNTER_ENABLED=ON -DCMAKE_TOOLCHAIN_FILE=$(pwd)/src/cmake/fpic_toolchain.cmake  -DCMAKE_BUILD_TYPE=Debug -DBUILD_MAVSDK_SERVER=OFF -DBUILD_SHARED_LIBS=OFF -DENABLE_CPPTRACE=On -Bbuild -H.
+        run: cmake -DSUPERBUILD=OFF -DHUNTER_ENABLED=ON -DCMAKE_TOOLCHAIN_FILE=$(pwd)/cmake/fpic_toolchain.cmake  -DCMAKE_BUILD_TYPE=Debug -DBUILD_MAVSDK_SERVER=OFF -DBUILD_SHARED_LIBS=OFF -DENABLE_CPPTRACE=On -Bbuild -H.
       - name: build
         run: cmake --build build -j2
       - name: unit tests

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -41,7 +41,7 @@ message(STATUS "Version patch: ${MAVSDK_VERSION_PATCH}")
 set(MAVSDK_SOVERSION_STRING ${MAVSDK_VERSION_MAJOR})
 set(MAVSDK_VERSION_STRING ${MAVSDK_VERSION_MAJOR}.${MAVSDK_VERSION_MINOR}.${MAVSDK_VERSION_PATCH})
 
-include("src/cmake/HunterGate.cmake")
+include("cmake/HunterGate.cmake")
 HunterGate(
     URL "https://github.com/cpp-pm/hunter/archive/v0.23.315.tar.gz"
     SHA1 "ea5d72afc0df67f2126e7fd069f20c5f723709e1"

diff --git a/src/cmake/HunterGate.cmake → cmake/HunterGate.cmake b/src/cmake/HunterGate.cmake → cmake/HunterGate.cmake
diff --git a/src/cmake/Modules/FindCURL.cmake → cmake/Modules/common/FindCURL.cmake b/src/cmake/Modules/FindCURL.cmake → cmake/Modules/common/FindCURL.cmake
diff --git a/src/cmake/Modules/Findjsoncpp.cmake → cmake/Modules/common/Findjsoncpp.cmake b/src/cmake/Modules/Findjsoncpp.cmake → cmake/Modules/common/Findjsoncpp.cmake
diff --git a/src/cmake/Modules/Findtinyxml2.cmake → cmake/Modules/common/Findtinyxml2.cmake b/src/cmake/Modules/Findtinyxml2.cmake → cmake/Modules/common/Findtinyxml2.cmake