|
 |
9636c73 |
--- CMakeModules/FindCROSSGUID.orig.cmake 2019-03-23 19:54:03.269453000 +0100
|
|
|
9636c73 |
+++ CMakeModules/FindCROSSGUID.cmake 2019-03-23 19:56:45.218630640 +0100
|
|
|
0d9312f |
@@ -21,11 +21,11 @@
|
|
|
8d4b98d |
string(TOUPPER ${PROJECT_NAME} _UPPER_PROJECT_NAME)
|
|
|
8d4b98d |
set(_PROJECT_DEPENDENCY_DIR ${_UPPER_PROJECT_NAME}_DEPENDENCY_DIR)
|
|
|
9636c73 |
|
|
|
9636c73 |
-find_package(crossguid CONFIG REQUIRED
|
|
|
9636c73 |
- CONFIGS crossguid-config.cmake
|
|
|
9636c73 |
+find_package(crossguid2 CONFIG REQUIRED
|
|
|
9636c73 |
+ CONFIGS crossguid2-config.cmake
|
|
|
9636c73 |
PATHS $ENV{CROSSGUID_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake
|
|
|
8d4b98d |
${${_PROJECT_DEPENDENCY_DIR}}/${CMAKE_INSTALL_LIBDIR}/cmake
|
|
|
9636c73 |
- /usr/${CMAKE_INSTALL_LIBDIR}/cmake
|
|
|
9636c73 |
+ ${CMAKE_INSTALL_LIBDIR}/cmake/crossguid2
|
|
|
0d9312f |
${CONAN_LIB_DIRS_CROSSGUID}/cmake
|
|
|
6bd8553 |
CMAKE_FIND_ROOT_PATH_BOTH
|
|
|
9636c73 |
)
|
|
|
8d4b98d |
@@ -34,6 +34,7 @@
|
|
|
8d4b98d |
|
|
|
9636c73 |
find_path(CROSSGUID_INCLUDE_DIR crossguid/guid.hpp
|
|
|
9636c73 |
PATHS $ENV{CROSSGUID_DIR}/include
|
|
|
9636c73 |
+ ${INCLUDE_INSTALL_DIR}/crossguid2
|
|
|
8d4b98d |
$ENV{CROSSGUID_DIR}
|
|
|
8d4b98d |
${${_PROJECT_DEPENDENCY_DIR}}/include
|
|
|
8d4b98d |
${${_PROJECT_DEPENDENCY_DIR}}
|
|
|
8d4b98d |
@@ -51,7 +52,7 @@
|
|
|
9636c73 |
endif (NOT CROSSGUID_INCLUDE_DIR)
|
|
|
9636c73 |
|
|
|
9636c73 |
find_library(CROSSGUID_LIBRARY
|
|
|
9636c73 |
- NAMES crossguid crossguid-dgb
|
|
|
9636c73 |
+ NAMES crossguid2 crossguid-dgb
|
|
|
9636c73 |
PATHS $ENV{CROSSGUID_DIR}/lib
|
|
|
9636c73 |
$ENV{CROSSGUID_DIR}
|
|
|
8d4b98d |
${${_PROJECT_DEPENDENCY_DIR}}/${CMAKE_INSTALL_LIBDIR}
|
|
|
8d4b98d |
@@ -82,14 +83,14 @@
|
|
|
9636c73 |
else ()
|
|
|
9636c73 |
set(CROSSGUID_FOUND ${crossguid_FOUND})
|
|
|
9636c73 |
|
|
|
9636c73 |
- get_target_property(CROSSGUID_INCLUDE_DIR crossguid INTERFACE_INCLUDE_DIRECTORIES)
|
|
|
9636c73 |
- get_target_property(CROSSGUID_LIBRARY crossguid IMPORTED_LOCATION_RELEASE)
|
|
|
9636c73 |
+ get_target_property(CROSSGUID_INCLUDE_DIR crossguid2 INTERFACE_INCLUDE_DIRECTORIES)
|
|
|
9636c73 |
+ get_target_property(CROSSGUID_LIBRARY crossguid2 IMPORTED_LOCATION_RELEASE)
|
|
|
9636c73 |
|
|
|
9636c73 |
if (NOT CROSSGUID_LIBRARY)
|
|
|
9636c73 |
get_target_property(CROSSGUID_LIBRARY crossguid IMPORTED_LOCATION_DEBUG)
|
|
|
9636c73 |
endif()
|
|
|
9636c73 |
|
|
|
9636c73 |
- get_target_property(CROSSGUID_INTERFACE_LINK_LIBRARIES crossguid INTERFACE_LINK_LIBRARIES)
|
|
|
9636c73 |
+ get_target_property(CROSSGUID_INTERFACE_LINK_LIBRARIES crossguid2 INTERFACE_LINK_LIBRARIES)
|
|
|
9636c73 |
|
|
|
9636c73 |
if (CROSSGUID_INTERFACE_LINK_LIBRARIES)
|
|
|
9636c73 |
set(CROSSGUID_LIBRARY ${CROSSGUID_LIBRARY} ${CROSSGUID_INTERFACE_LINK_LIBRARIES})
|