diff options
| author | Brent Murphy <bmurphy@bcmcs.net> | 2022-03-24 10:17:17 +1000 |
|---|---|---|
| committer | Brent Murphy <bmurphy@bcmcs.net> | 2022-03-24 10:17:17 +1000 |
| commit | 9da4980bea01fb10a060438319746382a9b1df6b (patch) | |
| tree | 109cd12f3d2940a425dc9ab22f0946d6930627e5 /cmake | |
| parent | 141f9aa5faea285750599fa6ad1f598627bd1d82 (diff) | |
[cmake] FindCrossguid fixes
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindCrossGUID.cmake | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/cmake/modules/FindCrossGUID.cmake b/cmake/modules/FindCrossGUID.cmake index c10275c3cd..440db17566 100644 --- a/cmake/modules/FindCrossGUID.cmake +++ b/cmake/modules/FindCrossGUID.cmake @@ -20,7 +20,7 @@ if(ENABLE_INTERNAL_CROSSGUID) # Temp: We force CMAKE_BUILD_TYPE to release, and makefile builds respect this # Multi config generators (eg VS, Xcode) dont, so handle debug postfix build/link for them only - if(NOT CMAKE_GENERATOR STREQUAL "Unix Makefiles") + if(NOT CMAKE_GENERATOR STREQUAL "Unix Makefiles" OR NOT CMAKE_GENERATOR STREQUAL "Ninja") set(CROSSGUID_DEBUG_POSTFIX "-dgb") endif() @@ -50,18 +50,23 @@ if(ENABLE_INTERNAL_CROSSGUID) else() if(PKG_CONFIG_FOUND) - pkg_check_modules(PC_CROSSGUID crossguid REQUIRED QUIET) + pkg_check_modules(PC_CROSSGUID crossguid QUIET) set(CROSSGUID_VERSION ${PC_CROSSGUID_VERSION}) endif() - find_path(CROSSGUID_INCLUDE_DIR NAMES crossguid/guid.hpp guid.h - PATHS ${PC_CROSSGUID_INCLUDEDIR}) - - find_library(CROSSGUID_LIBRARY_RELEASE NAMES crossguid - PATHS ${PC_CROSSGUID_LIBDIR}) - find_library(CROSSGUID_LIBRARY_DEBUG NAMES crossguidd crossguid-dgb - PATHS ${PC_CROSSGUID_LIBDIR}) - + if(CROSSGUID_FOUND) + find_path(CROSSGUID_INCLUDE_DIR NAMES crossguid/guid.hpp guid.h + PATHS ${PC_CROSSGUID_INCLUDEDIR}) + + find_library(CROSSGUID_LIBRARY_RELEASE NAMES crossguid + PATHS ${PC_CROSSGUID_LIBDIR}) + find_library(CROSSGUID_LIBRARY_DEBUG NAMES crossguidd crossguid-dgb + PATHS ${PC_CROSSGUID_LIBDIR}) + else() + find_path(CROSSGUID_INCLUDE_DIR NAMES crossguid/guid.hpp guid.h) + find_library(CROSSGUID_LIBRARY_RELEASE NAMES crossguid) + find_library(CROSSGUID_LIBRARY_DEBUG NAMES crossguidd) + endif() endif() # Select relevant lib build type (ie CROSSGUID_LIBRARY_RELEASE or CROSSGUID_LIBRARY_DEBUG) |