aboutsummaryrefslogtreecommitdiff
path: root/ports/lcms
diff options
context:
space:
mode:
authorBarath Kannan <barathsotd@gmail.com>2017-12-27 16:57:43 +1100
committerBarath Kannan <barathsotd@gmail.com>2017-12-27 16:57:43 +1100
commitd8f0ea999983892b8e5e49340ece3474ee257156 (patch)
treece9b615075350d90d0b7312874bae6dd202fe93b /ports/lcms
parent22e9a2b25db21e1d1a1f75786442f2c90ae0db0c (diff)
parent6e05f9cdf5cf4d53153214f4d4b29133b368bc4d (diff)
downloadvcpkg-d8f0ea999983892b8e5e49340ece3474ee257156.tar.gz
vcpkg-d8f0ea999983892b8e5e49340ece3474ee257156.zip
resolve merge conflicts
Diffstat (limited to 'ports/lcms')
-rw-r--r--ports/lcms/CMakeLists.txt2
-rw-r--r--ports/lcms/CONTROL2
-rw-r--r--ports/lcms/portfile.cmake2
3 files changed, 4 insertions, 2 deletions
diff --git a/ports/lcms/CMakeLists.txt b/ports/lcms/CMakeLists.txt
index 809fe505e..10ccc0b02 100644
--- a/ports/lcms/CMakeLists.txt
+++ b/ports/lcms/CMakeLists.txt
@@ -33,6 +33,8 @@ set(SRCS
"src/cmssm.c"
)
+set(CMAKE_DEBUG_POSTFIX d)
+
add_definitions(-DUNICODE -D_UNICODE)
if(BUILD_SHARED_LIBS)
diff --git a/ports/lcms/CONTROL b/ports/lcms/CONTROL
index 03efca607..5855fbc71 100644
--- a/ports/lcms/CONTROL
+++ b/ports/lcms/CONTROL
@@ -1,4 +1,4 @@
Source: lcms
-Version: 2.8-3
+Version: 2.8-4
Build-Depends:
Description: Little CMS.
diff --git a/ports/lcms/portfile.cmake b/ports/lcms/portfile.cmake
index eeb12243c..7d52e5270 100644
--- a/ports/lcms/portfile.cmake
+++ b/ports/lcms/portfile.cmake
@@ -13,7 +13,7 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
- OPTIONS_DEBUG
+ OPTIONS_DEBUG
-DSKIP_INSTALL_HEADERS=ON
)