implment reviews.

This commit is contained in:
agadoul 2017-01-30 15:22:39 +01:00
parent 798ae24d96
commit 4ef429dd9e
3 changed files with 19 additions and 7 deletions

View File

@ -2,8 +2,6 @@ cmake_minimum_required(VERSION 3.5)
project(lcms)
option(SHARED_LIBRARY "use shared library" ON)
set(SRCS
"src/cmstypes.c"
"src/cmsvirt.c"
@ -44,7 +42,7 @@ include_directories(
add_library(lcms ${SRCS})
if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL )
if(NOT SKIP_INSTALL_HEADERS )
install(FILES
"./include/lcms2.h"
@ -52,7 +50,7 @@ if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL )
DESTINATION include
)
endif(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL )
endif(NOT SKIP_INSTALL_HEADERS )
install(TARGETS lcms EXPORT lcms_EXPORT
RUNTIME DESTINATION bin

View File

@ -3,7 +3,6 @@ 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"
#URLS "C:/Users/d3r55d/Downloads/lcms2-2.8.tar.gz"
FILENAME "lcms2-2.8.tar.gz"
SHA512 a9478885b4892c79314a2ef9ab560e6655ac8f2d17abae0805e8b871138bb190e21f0e5c805398449f9dad528dc50baaf9e3cce8b8158eb8ff74179be5733f8f
)
@ -18,8 +17,6 @@ endif()
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
OPTIONS
-DSHARED_LIBRARY=${USE_SHARED_LIBRARY}
OPTIONS_DEBUG
-DSKIP_INSTALL_HEADERS=ON
)
@ -29,3 +26,10 @@ vcpkg_install_cmake()
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/lcms RENAME copyright)
vcpkg_copy_pdbs()
#patch header files to fix import/export issues
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)

10
ports/lcms/shared.patch Normal file
View File

@ -0,0 +1,10 @@
--- lcms2.h Wed Jul 20 08:46:01 2016
+++ lcms2.h Mon Jan 30 15:01:12 2017
@@ -212,6 +212,7 @@
#endif // CMS_USE_BIG_ENDIAN
+#define CMS_DLL_BUILD
// Calling convention -- this is hardly platform and compiler dependent
#ifdef CMS_IS_WINDOWS_