aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcodicodi <rob.ceglinski@gmail.com>2017-06-09 00:55:17 +0200
committercodicodi <rob.ceglinski@gmail.com>2017-06-09 00:55:17 +0200
commit346c2bee991499ba6698545501e958608638b900 (patch)
tree5287ed2f764ae3838b8fd25aae865e2fbc97d98c
parenta24dacfc9709787e4e2e63017056fdb2cdcc6ba5 (diff)
downloadvcpkg-346c2bee991499ba6698545501e958608638b900.tar.gz
vcpkg-346c2bee991499ba6698545501e958608638b900.zip
[fltk] force import macro to either 0 or 1
-rw-r--r--ports/fltk/CONTROL2
-rw-r--r--ports/fltk/portfile.cmake11
2 files changed, 12 insertions, 1 deletions
diff --git a/ports/fltk/CONTROL b/ports/fltk/CONTROL
index 2fdb2eecb..2b4f00629 100644
--- a/ports/fltk/CONTROL
+++ b/ports/fltk/CONTROL
@@ -1,4 +1,4 @@
Source: fltk
-Version: 1.3.4-3
+Version: 1.3.4-4
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 ba9058316..c6c6fd830 100644
--- a/ports/fltk/portfile.cmake
+++ b/ports/fltk/portfile.cmake
@@ -28,6 +28,7 @@ endif()
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
+ PREFER_NINJA
OPTIONS
-DOPTION_BUILD_EXAMPLES=OFF
-DOPTION_USE_SYSTEM_ZLIB=ON
@@ -71,6 +72,16 @@ else()
endforeach()
endif()
+foreach(FILE Fl_Export.H fl_utf8.h)
+ file(READ ${CURRENT_PACKAGES_DIR}/include/FL/${FILE} FLTK_HEADER)
+ if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+ string(REPLACE "defined(FL_DLL)" "0" FLTK_HEADER "${FLTK_HEADER}")
+ else()
+ string(REPLACE "defined(FL_DLL)" "1" FLTK_HEADER "${FLTK_HEADER}")
+ endif()
+ file(WRITE ${CURRENT_PACKAGES_DIR}/include/FL/${FILE} "${FLTK_HEADER}")
+endforeach()
+
file(INSTALL
${SOURCE_PATH}/COPYING
DESTINATION ${CURRENT_PACKAGES_DIR}/share/fltk