diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-03-31 09:03:37 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-03-31 09:03:37 -0700 |
| commit | 96f30cae00cec0c287b012502ab4e2aacd3d0672 (patch) | |
| tree | bdced0b3febd070b2f79e11013c6c456a63fbdbb | |
| parent | 558d54dd4e86055c336e1d5f677407631edf1917 (diff) | |
| download | vcpkg-96f30cae00cec0c287b012502ab4e2aacd3d0672.tar.gz vcpkg-96f30cae00cec0c287b012502ab4e2aacd3d0672.zip | |
[freeimage] Add build for FreeImagePlus.
| -rw-r--r-- | ports/freeimage/CMakeLists.txt | 34 | ||||
| -rw-r--r-- | ports/freeimage/CONTROL | 2 | ||||
| -rw-r--r-- | ports/freeimage/portfile.cmake | 4 |
3 files changed, 35 insertions, 5 deletions
diff --git a/ports/freeimage/CMakeLists.txt b/ports/freeimage/CMakeLists.txt index 80a40b43b..1cafdd880 100644 --- a/ports/freeimage/CMakeLists.txt +++ b/ports/freeimage/CMakeLists.txt @@ -18,6 +18,7 @@ find_package(JXR REQUIRED) find_package(LibRaw REQUIRED) option(BUILD_SHARED_LIBS "Build shared libraries" ON) +option(INSTALL_HEADERS "Install the development headers" ON) set(REAL_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Source) @@ -125,7 +126,7 @@ target_include_directories(FreeImage PRIVATE ${REAL_SOURCE_DIR} ${LibRaw_INCLUDE_DIRS} ${FreeImage_Private_OpenEXR_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR}) - + target_link_libraries(FreeImage ${ZLIB_LIBRARIES} ${JPEG_LIBRARIES} @@ -139,10 +140,39 @@ target_link_libraries(FreeImage ${ZLIB_LIBRARIES} target_compile_definitions(FreeImage PRIVATE ${PNG_DEFINITIONS}) +# FreeImagePlus +file(GLOB FREEIMAGEPLUS_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/Wrapper/FreeImagePlus/src/*.cpp) +add_library(FreeImagePlus + ${FREEIMAGEPLUS_SOURCES} + ${CMAKE_CURRENT_SOURCE_DIR}/Wrapper/FreeImagePlus/FreeImagePlus.h + ${CMAKE_CURRENT_SOURCE_DIR}/Wrapper/FreeImagePlus/FreeImagePlus.rc) + +if(${BUILD_SHARED_LIBS}) + target_compile_definitions(FreeImagePlus PRIVATE -DFIP_EXPORTS) +else() + target_compile_definitions(FreeImagePlus PRIVATE -DFREEIMAGE_LIB) +endif() + +target_include_directories(FreeImagePlus PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/Wrapper/FreeImagePlus + ${CMAKE_CURRENT_BINARY_DIR} + ${REAL_SOURCE_DIR}) + +target_link_libraries(FreeImagePlus PUBLIC FreeImage) + +list(APPEND PUBLIC_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/Wrapper/FreeImagePlus/FreeImagePlus.h) + install(TARGETS FreeImage COMPONENT runtime RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT bin LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT shlib ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT lib) -install(FILES ${PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
\ No newline at end of file +install(TARGETS FreeImagePlus + COMPONENT runtime-cpp + RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT bin + LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT shlib + ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT lib) + +if(INSTALL_HEADERS) + install(FILES ${PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) +endif()
\ No newline at end of file diff --git a/ports/freeimage/CONTROL b/ports/freeimage/CONTROL index 961acc4be..9eb197b10 100644 --- a/ports/freeimage/CONTROL +++ b/ports/freeimage/CONTROL @@ -1,4 +1,4 @@ Source: freeimage -Version: 3.17.0 +Version: 3.17.0-1 Build-Depends: zlib, libpng, libjpeg-turbo, tiff, openjpeg, libwebp, libraw, jxrlib Description: Support library for graphics image formats diff --git a/ports/freeimage/portfile.cmake b/ports/freeimage/portfile.cmake index 3e403f9ea..e48782bf0 100644 --- a/ports/freeimage/portfile.cmake +++ b/ports/freeimage/portfile.cmake @@ -43,12 +43,12 @@ vcpkg_apply_patches( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS_DEBUG -DINSTALL_HEADERS=OFF ) vcpkg_install_cmake() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - # Handle copyright file(COPY ${SOURCE_PATH}/license-fi.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/freeimage) file(RENAME ${CURRENT_PACKAGES_DIR}/share/freeimage/license-fi.txt ${CURRENT_PACKAGES_DIR}/share/freeimage/copyright) |