Update CMake modules.
Merge commit 'dd2c7e902aa095fd7844329e38bca7cd7c51e6d9' into osx-refactor_sync-mplus Conflicts: cmake/FindWinHID.cmake
This commit is contained in:
@@ -40,11 +40,15 @@
|
||||
# Brandon Newendorp <brandon@newendorp.com>
|
||||
|
||||
set(_HUMAN "VPR 2.2")
|
||||
set(_RELEASE_NAMES vpr-2_2 libvpr-2_2 vpr-2_2_0)
|
||||
set(_DEBUG_NAMES vpr_d-2_2 libvpr_d-2_2 vpr_d-2_2_0)
|
||||
set(_FP_PKG_NAME vpr)
|
||||
set(_RELEASE_NAMES)
|
||||
set(_DEBUG_NAMES)
|
||||
foreach(VER 2_2 2_2_0 2_2_1 2_2_2)
|
||||
list(APPEND _RELEASE_NAMES ${_FP_PKG_NAME}-${VER})
|
||||
list(APPEND _DEBUG_NAMES ${_FP_PKG_NAME}_d-${VER})
|
||||
endforeach()
|
||||
set(_DIR vpr-2.2)
|
||||
set(_HEADER vpr/vpr.h)
|
||||
set(_FP_PKG_NAME vpr)
|
||||
|
||||
include(SelectLibraryConfigurations)
|
||||
include(CreateImportedTarget)
|
||||
@@ -193,8 +197,9 @@ if(UNIX AND NOT WIN32)
|
||||
if(NOT APPLE)
|
||||
find_library(VPR22_libuuid_LIBRARY NAMES uuid)
|
||||
mark_as_advanced(VPR22_libuuid_LIBRARY)
|
||||
list(APPEND _deps_check VPR22_libuuid_LIBRARY)
|
||||
list(APPEND _deps_libs ${VPR22_libuuid_LIBRARY})
|
||||
if(VPR22_libuuid_LIBRARY)
|
||||
list(APPEND _deps_libs ${VPR22_libuuid_LIBRARY})
|
||||
endif()
|
||||
endif()
|
||||
endif()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user