diff options
| author | Alexander Kaspar <alexander.kaspar@gmail.com> | 2016-12-05 09:13:22 +0100 |
|---|---|---|
| committer | Alexander Kaspar <alexander.kaspar@gmail.com> | 2016-12-05 09:13:22 +0100 |
| commit | a985fc2de8192fb159c8f90ca08fd513b09b8b3a (patch) | |
| tree | 69f26c354e387750da929a87ec9c1a124b17fe9d /scripts | |
| parent | c5b6f019bde3ab43b6a4f7e7e5477d5209af7e1f (diff) | |
| parent | a710f67e5281480ab22d0ef372d376696f5fc8ab (diff) | |
| download | vcpkg-a985fc2de8192fb159c8f90ca08fd513b09b8b3a.tar.gz vcpkg-a985fc2de8192fb159c8f90ca08fd513b09b8b3a.zip | |
Merge branch 'master' into qca
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/buildsystems/vcpkg.cmake | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index 44db05a22..7be93e54d 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -49,7 +49,6 @@ if(NOT VCPKG_TOOLCHAIN) list(APPEND CMAKE_LIBRARY_PATH ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib/manual-link ) - link_directories(${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/lib/manual-link) endif() list(APPEND CMAKE_PREFIX_PATH ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET} @@ -57,9 +56,6 @@ if(NOT VCPKG_TOOLCHAIN) list(APPEND CMAKE_LIBRARY_PATH ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/manual-link ) - link_directories(${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib/manual-link) - - include_directories(${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include) set(CMAKE_PROGRAM_PATH ${CMAKE_PROGRAM_PATH} ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/tools) @@ -83,7 +79,9 @@ if(NOT VCPKG_TOOLCHAIN) function(add_library name) _add_library(${ARGV}) list(FIND ARGV "IMPORTED" IMPORTED_IDX) - if(IMPORTED_IDX EQUAL -1) + list(FIND ARGV "INTERFACE" INTERFACE_IDX) + list(FIND ARGV "ALIAS" ALIAS_IDX) + if(IMPORTED_IDX EQUAL -1 AND INTERFACE_IDX EQUAL -1 AND ALIAS_IDX EQUAL -1) set_target_properties(${name} PROPERTIES VS_GLOBAL_VcpkgEnabled false) endif() endfunction() |