aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2017-11-25 13:49:43 -0800
committerRobert Schumacher <roschuma@microsoft.com>2017-11-25 13:49:51 -0800
commit22fbd3ac362b8225eaf8727a3b077e6beec37c78 (patch)
tree45633fbe325540203cdffa63f24259f9b50d07d2
parentd299848f218792c2601c6a224815b4a99eeb27bb (diff)
downloadvcpkg-22fbd3ac362b8225eaf8727a3b077e6beec37c78.tar.gz
vcpkg-22fbd3ac362b8225eaf8727a3b077e6beec37c78.zip
[libpng] Remove unneeded CMAKE_SYSTEM_PROCESSOR override
-rw-r--r--ports/libpng/portfile.cmake8
1 files changed, 0 insertions, 8 deletions
diff --git a/ports/libpng/portfile.cmake b/ports/libpng/portfile.cmake
index c2067ff9b..4273846e9 100644
--- a/ports/libpng/portfile.cmake
+++ b/ports/libpng/portfile.cmake
@@ -22,13 +22,6 @@ else()
set(PNG_SHARED_LIBS OFF)
endif()
-# Libpng's cmake uses if(${CMAKE_SYSTEM_PROCESSOR} ....) which performs double-evaluation and breaks if the variable is not defined.
-if(VCPKG_TARGET_ARCHITECTURE STREQUAL x64)
- set(CMAKE_SYSTEM_PROCESSOR AMD64)
-else()
- set(CMAKE_SYSTEM_PROCESSOR ${VCPKG_TARGET_ARCHITECTURE})
-endif()
-
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
@@ -39,7 +32,6 @@ vcpkg_configure_cmake(
-DSKIP_INSTALL_PROGRAMS=ON
-DSKIP_INSTALL_EXECUTABLES=ON
-DSKIP_INSTALL_FILES=ON
- -DCMAKE_SYSTEM_PROCESSOR=${CMAKE_SYSTEM_PROCESSOR}
OPTIONS_DEBUG
-DSKIP_INSTALL_HEADERS=ON
)