diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-05-23 01:12:40 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-23 01:12:40 -0700 |
| commit | dfaa7a831c914447cb9413bc82bd3ea2ee72594b (patch) | |
| tree | 5959fda6d518b0712ecb37863e9ddf13771f0de9 | |
| parent | a1215cd26e6f728b83065047ca9eda12811f7b10 (diff) | |
| parent | 1780157dbc64bf568fe0f9653b585f519ab1a019 (diff) | |
| download | vcpkg-dfaa7a831c914447cb9413bc82bd3ea2ee72594b.tar.gz vcpkg-dfaa7a831c914447cb9413bc82bd3ea2ee72594b.zip | |
Merge pull request #1143 from smasherprog/patch-1
Added fluid.exe to output tools
| -rw-r--r-- | ports/fltk/CONTROL | 2 | ||||
| -rw-r--r-- | ports/fltk/portfile.cmake | 32 |
2 files changed, 22 insertions, 12 deletions
diff --git a/ports/fltk/CONTROL b/ports/fltk/CONTROL index 985c6b1c0..2fdb2eecb 100644 --- a/ports/fltk/CONTROL +++ b/ports/fltk/CONTROL @@ -1,4 +1,4 @@ Source: fltk
-Version: 1.3.4-2
+Version: 1.3.4-3
Description: FLTK (pronounced fulltick) is a cross-platform C++ GUI toolkit for UNIX/Linux (X11), Microsoft Windows, and MacOS X. FLTK provides modern GUI functionality without the bloat and supports 3D graphics via OpenGL and its built-in GLUT emulation.
Build-Depends: zlib, libpng, libjpeg-turbo
\ No newline at end of file diff --git a/ports/fltk/portfile.cmake b/ports/fltk/portfile.cmake index 261a03c7f..ba9058316 100644 --- a/ports/fltk/portfile.cmake +++ b/ports/fltk/portfile.cmake @@ -28,8 +28,11 @@ endif() vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
- OPTIONS
+ OPTIONS
-DOPTION_BUILD_EXAMPLES=OFF
+ -DOPTION_USE_SYSTEM_ZLIB=ON
+ -DOPTION_USE_SYSTEM_LIBPNG=ON
+ -DOPTION_USE_SYSTEM_LIBJPEG=ON
-DOPTION_BUILD_SHARED_LIBS=${BUILD_SHARED}
)
@@ -40,27 +43,34 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/CMAKE
${CURRENT_PACKAGES_DIR}/debug/include
)
+
+file(COPY ${CURRENT_PACKAGES_DIR}/bin/fluid.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools/fltk)
file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/fluid.exe)
file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/fltk-config)
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/fluid.exe)
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/fltk-config)
+
vcpkg_copy_pdbs()
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/fltk)
-
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+ file(REMOVE_RECURSE
+ ${CURRENT_PACKAGES_DIR}/debug/bin
+ ${CURRENT_PACKAGES_DIR}/bin
+ )
else()
- file(REMOVE_RECURSE
- ${CURRENT_PACKAGES_DIR}/debug/bin
- ${CURRENT_PACKAGES_DIR}/bin
- )
-
-
+ file(GLOB SHARED_LIBS "${CURRENT_PACKAGES_DIR}/lib/*_SHARED.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/*_SHAREDd.lib")
+ file(GLOB STATIC_LIBS "${CURRENT_PACKAGES_DIR}/lib/*.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/*.lib")
+ list(FILTER STATIC_LIBS EXCLUDE REGEX "_SHAREDd?\\.lib\$")
+ file(REMOVE ${STATIC_LIBS})
+ foreach(SHARED_LIB ${SHARED_LIBS})
+ string(REGEX REPLACE "_SHARED(d?)\\.lib\$" "\\1.lib" NEWNAME ${SHARED_LIB})
+ file(RENAME ${SHARED_LIB} ${NEWNAME})
+ endforeach()
endif()
-
-
file(INSTALL
${SOURCE_PATH}/COPYING
DESTINATION ${CURRENT_PACKAGES_DIR}/share/fltk
|