Configuration, CMake - prevent implicitly using system packages

FFmpeg, libconfig++, OpenVR, when their search root folder is specified explicitly.
gkv311 · Jan 15, 2025 · 32cd314 · 32cd314
1 parent 9a566e0
commit 32cd314
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/adm/cmake/FindFFmpeg.cmake b/adm/cmake/FindFFmpeg.cmake
@@ -78,7 +78,7 @@ if (FFMPEG_INCLUDE_DIR_FOUND AND FFMPEG_LIBRARY_DIR_FOUND)
       endif()
     endif()
   endforeach()
-else()
+elseif ("${FFMPEG_DIR}" STREQUAL "")
   # FFmpeg doesn't provide CMake configs, but has pkgconfig
   find_package (PkgConfig REQUIRED)
   pkg_check_modules (LIBAV REQUIRED IMPORTED_TARGET libavcodec libavdevice libavformat libavutil libswscale)
@@ -100,4 +100,6 @@ else()
       set_target_properties (${aLibIter} PROPERTIES IMPORTED_LOCATION "${FFMPEG_LIBRARY_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}${aLibIter}${CMAKE_SHARED_LIBRARY_SUFFIX}")
     endforeach()
   endif()
+else()
+  set (FFMPEG_FOUND OFF)
 endif()
diff --git a/adm/cmake/FindLibconfigCpp.cmake b/adm/cmake/FindLibconfigCpp.cmake
@@ -73,7 +73,7 @@ if (LIBCONFIGCPP_INCLUDE_DIR_FOUND AND LIBCONFIGCPP_LIBRARY_DIR_FOUND)
       set_target_properties (libconfig++ PROPERTIES IMPORTED_LOCATION "${LIBCONFIGCPP_LIBRARY_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}${LIBCONFIGCPP_TKNAME}${CMAKE_SHARED_LIBRARY_SUFFIX}")
     endif()
   endif()
-else()
+elseif ("${LIBCONFIGCPP_DIR}" STREQUAL "")
   # fallback
   unset (LIBCONFIGCPP_INCLUDE_DIR)
   unset (LIBCONFIGCPP_LIBRARY)
@@ -88,4 +88,6 @@ else()
     set_target_properties (libconfig++ PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${LIBCONFIGCPP_INCLUDE_DIR}")
     set_target_properties (libconfig++ PROPERTIES IMPORTED_LOCATION "${LIBCONFIGCPP_LIBRARY}")
   endif()
+else()
+  set (LIBCONFIGCPP_FOUND OFF)
 endif()
diff --git a/adm/cmake/FindOpenVR.cmake b/adm/cmake/FindOpenVR.cmake
@@ -73,7 +73,7 @@ if (OPENVR_INCLUDE_DIR_FOUND AND OPENVR_LIBRARY_DIR_FOUND)
       endif()
     endif()
   endforeach()
-else()
+elseif ("${OPENVR_DIR}" STREQUAL "")
   # OpenVR doesn't provide CMake configs, but has pkgconfig
   find_package (PkgConfig REQUIRED)
   pkg_check_modules (LIBVR REQUIRED IMPORTED_TARGET openvr)
@@ -95,4 +95,6 @@ else()
       set_target_properties (${aLibIter} PROPERTIES IMPORTED_LOCATION "${OPENVR_LIBRARY_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}${aLibIter}${CMAKE_SHARED_LIBRARY_SUFFIX}")
     endforeach()
   endif()
+else()
+  set (OPENVR_FOUND OFF)
 endif()