diff options
| author | jasjuang <jasjuang@gmail.com> | 2017-09-22 08:16:32 -0700 |
|---|---|---|
| committer | jasjuang <jasjuang@gmail.com> | 2017-09-22 08:16:32 -0700 |
| commit | f643a8422f87c5a16e3cc77e3e321e34a45f7103 (patch) | |
| tree | 419c9a2e74ab577aab0e868441b9a0e4c15d4919 /ports/lcms | |
| parent | 9989177fed607cdc9e20127ff7c22e3266e7c913 (diff) | |
| parent | fac96eb344a500405ab65b7e7f3755af0ad00b7e (diff) | |
| download | vcpkg-f643a8422f87c5a16e3cc77e3e321e34a45f7103.tar.gz vcpkg-f643a8422f87c5a16e3cc77e3e321e34a45f7103.zip | |
Merge branch 'master' of https://github.com/jasjuang/vcpkg
Diffstat (limited to 'ports/lcms')
| -rw-r--r-- | ports/lcms/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | ports/lcms/CONTROL | 4 | ||||
| -rw-r--r-- | ports/lcms/portfile.cmake | 24 | ||||
| -rw-r--r-- | ports/lcms/shared.patch | 2 |
4 files changed, 18 insertions, 17 deletions
diff --git a/ports/lcms/CMakeLists.txt b/ports/lcms/CMakeLists.txt index cd69bab3b..809fe505e 100644 --- a/ports/lcms/CMakeLists.txt +++ b/ports/lcms/CMakeLists.txt @@ -34,6 +34,11 @@ set(SRCS ) add_definitions(-DUNICODE -D_UNICODE) + +if(BUILD_SHARED_LIBS) + add_definitions(-DCMS_DLL_BUILD) +endif() + string(REPLACE "/utf-8" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") include_directories( diff --git a/ports/lcms/CONTROL b/ports/lcms/CONTROL index 2349503e9..03efca607 100644 --- a/ports/lcms/CONTROL +++ b/ports/lcms/CONTROL @@ -1,4 +1,4 @@ Source: lcms -Version: 2.8-1 +Version: 2.8-3 Build-Depends: -Description: Little CMS.
\ No newline at end of file +Description: Little CMS. diff --git a/ports/lcms/portfile.cmake b/ports/lcms/portfile.cmake index 4487cce6a..eeb12243c 100644 --- a/ports/lcms/portfile.cmake +++ b/ports/lcms/portfile.cmake @@ -1,22 +1,18 @@ include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/lcms2-2.8) -vcpkg_download_distfile(ARCHIVE - URLS "https://sourceforge.net/projects/lcms/files/lcms/2.8/lcms2-2.8.tar.gz/download" - FILENAME "lcms2-2.8.tar.gz" - SHA512 a9478885b4892c79314a2ef9ab560e6655ac8f2d17abae0805e8b871138bb190e21f0e5c805398449f9dad528dc50baaf9e3cce8b8158eb8ff74179be5733f8f -) -vcpkg_extract_source_archive(${ARCHIVE}) -message(STATUS ${SOURCE_PATH}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mm2/Little-CMS + REF lcms2.8 + SHA512 22ee94aa3333db4248607d8aa84343d324e04b30c154c46672c6f668e14a369b9b72f2557b8465218b6e9a2676cf8fa37d617b4aa13a013dc2337197a599e63a + HEAD_REF master +) -set(USE_SHARED_LIBRARY OFF) -if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - set(USE_SHARED_LIBRARY ON) -endif() +file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS_DEBUG -DSKIP_INSTALL_HEADERS=ON ) @@ -32,4 +28,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) vcpkg_apply_patches( SOURCE_PATH ${CURRENT_PACKAGES_DIR}/include PATCHES "${CMAKE_CURRENT_LIST_DIR}/shared.patch") -endif(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) +endif() diff --git a/ports/lcms/shared.patch b/ports/lcms/shared.patch index b3e7bf75f..2d7506c52 100644 --- a/ports/lcms/shared.patch +++ b/ports/lcms/shared.patch @@ -4,7 +4,7 @@ #endif // CMS_USE_BIG_ENDIAN -+#define CMS_DLL_BUILD ++#define CMS_DLL // Calling convention -- this is hardly platform and compiler dependent #ifdef CMS_IS_WINDOWS_ |