aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Christensen <philc@microsoft.com>2018-12-06 17:29:29 -0800
committerPhil Christensen <philc@microsoft.com>2018-12-06 17:29:29 -0800
commita1bb1bdebe44e94ebc446f9614ab3f0aebc75d82 (patch)
treeae7d473470e85f5ff37b0dc2435aa57e9164f320
parent7347305e8459fcc78553a9f88196e0d93eb0a8fe (diff)
downloadvcpkg-a1bb1bdebe44e94ebc446f9614ab3f0aebc75d82.tar.gz
vcpkg-a1bb1bdebe44e94ebc446f9614ab3f0aebc75d82.zip
[proj4] undo proj4 portfile changes
-rw-r--r--ports/proj4/portfile.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/ports/proj4/portfile.cmake b/ports/proj4/portfile.cmake
index 3317172ea..f7532a967 100644
--- a/ports/proj4/portfile.cmake
+++ b/ports/proj4/portfile.cmake
@@ -40,13 +40,13 @@ vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH share/proj4)
# Rename library and adapt cmake configuration
-if(MSVC AND NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
+if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
file(READ ${CURRENT_PACKAGES_DIR}/share/proj4/proj4-targets-release.cmake _contents)
string(REPLACE "proj_4_9.lib" "proj.lib" _contents "${_contents}")
file(WRITE ${CURRENT_PACKAGES_DIR}/share/proj4/proj4-targets-release.cmake "${_contents}")
endif()
-if(MSVC AND NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
+if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
file(READ ${CURRENT_PACKAGES_DIR}/share/proj4/proj4-targets-debug.cmake _contents)
string(REPLACE "proj_4_9_d.lib" "projd.lib" _contents "${_contents}")
file(WRITE ${CURRENT_PACKAGES_DIR}/share/proj4/proj4-targets-debug.cmake "${_contents}")