diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-04-28 15:56:36 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-04-28 15:56:36 +0000 |
| commit | b06cbe0aaab4156d7796d06083b29f0029caacf9 (patch) | |
| tree | fb979fb4cf4f8052c8cc66b1ec9516d91fcd859b /cmake/FindHWLOC.cmake | |
| parent | ebb9b35b8ba326e77933f1a8283f5f62decadf57 (diff) | |
| parent | bc0f5df265caa21a2120c22453655a7fcc941991 (diff) | |
| download | eigen-b06cbe0aaab4156d7796d06083b29f0029caacf9.tar.gz | |
Snap for 8512216 from bc0f5df265caa21a2120c22453655a7fcc941991 to tm-frc-media-releaset_frc_med_330443030android13-frc-media-release
Change-Id: I3ce64ce71cedb6c72ed116ba550b07bc9d82743c
Diffstat (limited to 'cmake/FindHWLOC.cmake')
| -rw-r--r-- | cmake/FindHWLOC.cmake | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/cmake/FindHWLOC.cmake b/cmake/FindHWLOC.cmake index a831b5c72..522f52157 100644 --- a/cmake/FindHWLOC.cmake +++ b/cmake/FindHWLOC.cmake @@ -65,8 +65,9 @@ endif() # Optionally use pkg-config to detect include/library dirs (if pkg-config is available) # ------------------------------------------------------------------------------------- -include(FindPkgConfig) -find_package(PkgConfig QUIET) +include(CMakeFindDependencyMacro) +# include(FindPkgConfig) +find_dependency(PkgConfig QUIET) if( PKG_CONFIG_EXECUTABLE AND NOT HWLOC_GIVEN_BY_USER ) pkg_search_module(HWLOC hwloc) @@ -85,7 +86,7 @@ if( PKG_CONFIG_EXECUTABLE AND NOT HWLOC_GIVEN_BY_USER ) endif() endif() -endif( PKG_CONFIG_EXECUTABLE AND NOT HWLOC_GIVEN_BY_USER ) +endif() if( (NOT PKG_CONFIG_EXECUTABLE) OR (PKG_CONFIG_EXECUTABLE AND NOT HWLOC_FOUND) OR (HWLOC_GIVEN_BY_USER) ) @@ -282,9 +283,9 @@ if( (NOT PKG_CONFIG_EXECUTABLE) OR (PKG_CONFIG_EXECUTABLE AND NOT HWLOC_FOUND) O set(CMAKE_REQUIRED_INCLUDES) set(CMAKE_REQUIRED_FLAGS) set(CMAKE_REQUIRED_LIBRARIES) - endif(HWLOC_LIBRARIES) + endif() -endif( (NOT PKG_CONFIG_EXECUTABLE) OR (PKG_CONFIG_EXECUTABLE AND NOT HWLOC_FOUND) OR (HWLOC_GIVEN_BY_USER) ) +endif() if (HWLOC_LIBRARIES) if (HWLOC_LIBRARY_DIRS) |