diff options
| author | Alexander Kaspar <alexander.kaspar@gmail.com> | 2016-12-05 17:43:13 +0100 |
|---|---|---|
| committer | Alexander Kaspar <alexander.kaspar@gmail.com> | 2016-12-05 17:43:13 +0100 |
| commit | dba8ebd9fce9d3044a1778c9204a70c98708b15b (patch) | |
| tree | e5bfbd2a6a39059c33688b4ddecbc7373c31b086 /scripts | |
| parent | 4a3cbbe5efaab268c2cce7cb301b58cccdd26f85 (diff) | |
| parent | e83e5321817b7b1667c2fcad23d78614185c504a (diff) | |
| download | vcpkg-dba8ebd9fce9d3044a1778c9204a70c98708b15b.tar.gz vcpkg-dba8ebd9fce9d3044a1778c9204a70c98708b15b.zip | |
Merge branch 'master' of https://github.com/Microsoft/vcpkg 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() |