diff options
| author | Thad House <thadhouse1@gmail.com> | 2019-05-31 13:50:30 -0700 |
|---|---|---|
| committer | Thad House <thadhouse1@gmail.com> | 2019-05-31 13:50:30 -0700 |
| commit | 94cf18d119e2f76ed429a78852d69890f70db8bc (patch) | |
| tree | 2fcb4c6b06a1a7b06e8e6e237e1239328d6c8851 | |
| parent | 788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b (diff) | |
| download | vcpkg-94cf18d119e2f76ed429a78852d69890f70db8bc.tar.gz vcpkg-94cf18d119e2f76ed429a78852d69890f70db8bc.zip | |
Fix vcpkg things
| -rw-r--r-- | scripts/buildsystems/vcpkg.cmake | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/scripts/buildsystems/vcpkg.cmake b/scripts/buildsystems/vcpkg.cmake index b83fcb1ca..f657e2710 100644 --- a/scripts/buildsystems/vcpkg.cmake +++ b/scripts/buildsystems/vcpkg.cmake @@ -107,11 +107,7 @@ if(NOT EXISTS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" AND NOT _CMAKE_I message(WARNING "There are no libraries installed for the Vcpkg triplet ${VCPKG_TARGET_TRIPLET}.") endif() -<<<<<<< HEAD -if(CMAKE_BUILD_TYPE MATCHES "^Debug$" OR NOT DEFINED CMAKE_BUILD_TYPE) #Debug build: Put Debug paths before Release paths. -======= if(CMAKE_BUILD_TYPE MATCHES "^[Dd][Ee][Bb][Uu][Gg]$" OR NOT DEFINED CMAKE_BUILD_TYPE) #Debug build: Put Debug paths before Release paths. ->>>>>>> upstream/master list(APPEND CMAKE_PREFIX_PATH ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug ${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET} ) |