mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-26 06:38:59 +08:00
146 lines
5.0 KiB
Diff
146 lines
5.0 KiB
Diff
diff --git a/cmake/FindBlosc.cmake b/cmake/FindBlosc.cmake
|
|
index cc80fc5..3ead1b3 100644
|
|
--- a/cmake/FindBlosc.cmake
|
|
+++ b/cmake/FindBlosc.cmake
|
|
@@ -99,13 +99,6 @@ elseif(DEFINED ENV{BLOSC_ROOT})
|
|
set(_BLOSC_ROOT $ENV{BLOSC_ROOT})
|
|
endif()
|
|
|
|
-# Additionally try and use pkconfig to find blosc
|
|
-
|
|
-if(NOT DEFINED PKG_CONFIG_FOUND)
|
|
- find_package(PkgConfig)
|
|
-endif()
|
|
-pkg_check_modules(PC_Blosc QUIET blosc)
|
|
-
|
|
# ------------------------------------------------------------------------
|
|
# Search for blosc include DIR
|
|
# ------------------------------------------------------------------------
|
|
diff --git a/cmake/FindCppUnit.cmake b/cmake/FindCppUnit.cmake
|
|
index af121ba..8fda97c 100644
|
|
--- a/cmake/FindCppUnit.cmake
|
|
+++ b/cmake/FindCppUnit.cmake
|
|
@@ -101,13 +101,6 @@ elseif(DEFINED ENV{CPPUNIT_ROOT})
|
|
set(_CPPUNIT_ROOT $ENV{CPPUNIT_ROOT})
|
|
endif()
|
|
|
|
-# Additionally try and use pkconfig to find cppunit
|
|
-
|
|
-if(NOT DEFINED PKG_CONFIG_FOUND)
|
|
- find_package(PkgConfig)
|
|
-endif()
|
|
-pkg_check_modules(PC_CppUnit QUIET cppunit)
|
|
-
|
|
# ------------------------------------------------------------------------
|
|
# Search for CppUnit include DIR
|
|
# ------------------------------------------------------------------------
|
|
diff --git a/cmake/FindIlmBase.cmake b/cmake/FindIlmBase.cmake
|
|
index f20f803..00a6d30 100644
|
|
--- a/cmake/FindIlmBase.cmake
|
|
+++ b/cmake/FindIlmBase.cmake
|
|
@@ -142,13 +142,6 @@ elseif(DEFINED ENV{ILMBASE_ROOT})
|
|
set(_ILMBASE_ROOT $ENV{ILMBASE_ROOT})
|
|
endif()
|
|
|
|
-# Additionally try and use pkconfig to find IlmBase
|
|
-
|
|
-if(NOT DEFINED PKG_CONFIG_FOUND)
|
|
- find_package(PkgConfig)
|
|
-endif()
|
|
-pkg_check_modules(PC_IlmBase QUIET IlmBase)
|
|
-
|
|
# ------------------------------------------------------------------------
|
|
# Search for IlmBase include DIR
|
|
# ------------------------------------------------------------------------
|
|
diff --git a/cmake/FindLog4cplus.cmake b/cmake/FindLog4cplus.cmake
|
|
index f11472e..f7388d4 100644
|
|
--- a/cmake/FindLog4cplus.cmake
|
|
+++ b/cmake/FindLog4cplus.cmake
|
|
@@ -101,13 +101,6 @@ elseif(DEFINED ENV{LOG4CPLUS_ROOT})
|
|
set(_LOG4CPLUS_ROOT $ENV{LOG4CPLUS_ROOT})
|
|
endif()
|
|
|
|
-# Additionally try and use pkconfig to find log4cplus
|
|
-
|
|
-if(NOT DEFINED PKG_CONFIG_FOUND)
|
|
- find_package(PkgConfig)
|
|
-endif()
|
|
-pkg_check_modules(PC_Log4cplus QUIET log4cplus)
|
|
-
|
|
# ------------------------------------------------------------------------
|
|
# Search for Log4cplus include DIR
|
|
# ------------------------------------------------------------------------
|
|
diff --git a/cmake/FindOpenEXR.cmake b/cmake/FindOpenEXR.cmake
|
|
index d0d356f..3d243d0 100644
|
|
--- a/cmake/FindOpenEXR.cmake
|
|
+++ b/cmake/FindOpenEXR.cmake
|
|
@@ -135,13 +135,6 @@ elseif(DEFINED ENV{OPENEXR_ROOT})
|
|
set(_OPENEXR_ROOT $ENV{OPENEXR_ROOT})
|
|
endif()
|
|
|
|
-# Additionally try and use pkconfig to find OpenEXR
|
|
-
|
|
-if(NOT DEFINED PKG_CONFIG_FOUND)
|
|
- find_package(PkgConfig)
|
|
-endif()
|
|
-pkg_check_modules(PC_OpenEXR QUIET OpenEXR)
|
|
-
|
|
# ------------------------------------------------------------------------
|
|
# Search for OpenEXR include DIR
|
|
# ------------------------------------------------------------------------
|
|
diff --git a/cmake/FindOpenVDB.cmake b/cmake/FindOpenVDB.cmake
|
|
index 18b1c83..01a2f04 100644
|
|
--- a/cmake/FindOpenVDB.cmake
|
|
+++ b/cmake/FindOpenVDB.cmake
|
|
@@ -142,13 +142,6 @@ elseif(DEFINED ENV{OPENVDB_ROOT})
|
|
set(_OPENVDB_ROOT $ENV{OPENVDB_ROOT})
|
|
endif()
|
|
|
|
-# Additionally try and use pkconfig to find OpenVDB
|
|
-
|
|
-if(NOT DEFINED PKG_CONFIG_FOUND)
|
|
- find_package(PkgConfig)
|
|
-endif()
|
|
-pkg_check_modules(PC_OpenVDB QUIET OpenVDB)
|
|
-
|
|
# This CMake module supports being called from external packages AND from
|
|
# within the OpenVDB repository for building openvdb components with the
|
|
# core library build disabled. Determine where we are being called from:
|
|
diff --git a/cmake/FindTBB.cmake b/cmake/FindTBB.cmake
|
|
index a537300..4be895b 100644
|
|
--- a/cmake/FindTBB.cmake
|
|
+++ b/cmake/FindTBB.cmake
|
|
@@ -126,13 +126,6 @@ elseif(DEFINED ENV{TBB_ROOT})
|
|
set(_TBB_ROOT $ENV{TBB_ROOT})
|
|
endif()
|
|
|
|
-# Additionally try and use pkconfig to find Tbb
|
|
-
|
|
-if(NOT DEFINED PKG_CONFIG_FOUND)
|
|
- find_package(PkgConfig)
|
|
-endif()
|
|
-pkg_check_modules(PC_Tbb QUIET tbb)
|
|
-
|
|
# ------------------------------------------------------------------------
|
|
# Search for tbb include DIR
|
|
# ------------------------------------------------------------------------
|
|
diff --git a/cmake/OpenVDBGLFW3Setup.cmake b/cmake/OpenVDBGLFW3Setup.cmake
|
|
index 84e54d9..bac685c 100644
|
|
--- a/cmake/OpenVDBGLFW3Setup.cmake
|
|
+++ b/cmake/OpenVDBGLFW3Setup.cmake
|
|
@@ -65,14 +65,6 @@ else()
|
|
endif()
|
|
endif()
|
|
|
|
-# Additionally try and use pkconfig to find glfw, though we only use
|
|
-# pkg-config to re-direct to the cmake. In other words, glfw's cmake is
|
|
-# expected to be installed
|
|
-if(NOT DEFINED PKG_CONFIG_FOUND)
|
|
- find_package(PkgConfig)
|
|
-endif()
|
|
-pkg_check_modules(PC_glfw3 QUIET glfw3)
|
|
-
|
|
if(PC_glfw3_FOUND)
|
|
foreach(DIR ${PC_glfw3_LIBRARY_DIRS})
|
|
list(APPEND _GLFW3_ROOT_SEARCH_DIR ${DIR})
|