early-access version 2853
This commit is contained in:
pineappleEA
13
externals/vcpkg/ports/fltk/config-path.patch
vendored
Executable file
13
externals/vcpkg/ports/fltk/config-path.patch
vendored
Executable file
@@ -0,0 +1,13 @@
|
||||
diff --git a/CMake/setup.cmake b/CMake/setup.cmake
|
||||
index 60b7da1..6831d29 100644
|
||||
--- a/CMake/setup.cmake
|
||||
+++ b/CMake/setup.cmake
|
||||
@@ -65,6 +65,8 @@ else ()
|
||||
set (FLTK_CONFIG_PATH ${FLTK_DATADIR}/fltk)
|
||||
endif (WIN32 AND NOT CYGWIN)
|
||||
|
||||
+set(FLTK_CONFIG_PATH share/fltk)
|
||||
+
|
||||
include(TestBigEndian)
|
||||
TEST_BIG_ENDIAN(WORDS_BIGENDIAN)
|
||||
|
||||
47
externals/vcpkg/ports/fltk/findlibsfix.patch
vendored
Executable file
47
externals/vcpkg/ports/fltk/findlibsfix.patch
vendored
Executable file
@@ -0,0 +1,47 @@
|
||||
diff --git a/CMake/resources.cmake b/CMake/resources.cmake
|
||||
index 57173f2..149aa62 100644
|
||||
--- a/CMake/resources.cmake
|
||||
+++ b/CMake/resources.cmake
|
||||
@@ -52,10 +52,8 @@ include (FindPkgConfig)
|
||||
fl_find_header (HAVE_ALSA_ASOUNDLIB_H alsa/asoundlib.h)
|
||||
fl_find_header (HAVE_DLFCN_H dlfcn.h)
|
||||
fl_find_header (HAVE_GL_GLU_H GL/glu.h)
|
||||
-fl_find_header (HAVE_LIBPNG_PNG_H libpng/png.h)
|
||||
fl_find_header (HAVE_LOCALE_H locale.h)
|
||||
fl_find_header (HAVE_OPENGL_GLU_H OpenGL/glu.h)
|
||||
-fl_find_header (HAVE_PNG_H png.h)
|
||||
fl_find_header (HAVE_STDIO_H stdio.h)
|
||||
fl_find_header (HAVE_STRINGS_H strings.h)
|
||||
fl_find_header (HAVE_SYS_SELECT_H sys/select.h)
|
||||
@@ -64,6 +62,17 @@ fl_find_header (HAVE_SYS_STDTYPES_H sys/stdtypes.h)
|
||||
fl_find_header (HAVE_X11_XREGION_H "X11/Xlib.h;X11/Xregion.h")
|
||||
fl_find_header (HAVE_XDBE_H "X11/Xlib.h;X11/extensions/Xdbe.h")
|
||||
|
||||
+find_package(PNG REQUIRED)
|
||||
+if(PNG_FOUND)
|
||||
+ set(LIB_png ${PNG_LIBRARIES})
|
||||
+ set(HAVE_PNG_H ${PNG_FOUND})
|
||||
+
|
||||
+endif()
|
||||
+find_package(ZLIB REQUIRED)
|
||||
+if(ZLIB_FOUND)
|
||||
+ set(LIB_zlib ${ZLIB_LIBRARIES})
|
||||
+endif()
|
||||
+
|
||||
if (WIN32 AND NOT CYGWIN)
|
||||
# we don't use pthreads on Windows (except for Cygwin, see options.cmake)
|
||||
set (HAVE_PTHREAD_H 0)
|
||||
@@ -171,12 +180,10 @@ find_library (LIB_GL GL)
|
||||
find_library (LIB_MesaGL MesaGL)
|
||||
find_library (LIB_GLEW GLEW)
|
||||
find_library (LIB_jpeg jpeg)
|
||||
-find_library (LIB_png png)
|
||||
-find_library (LIB_zlib z)
|
||||
|
||||
mark_as_advanced (LIB_dl LIB_fontconfig LIB_freetype)
|
||||
mark_as_advanced (LIB_GL LIB_MesaGL LIB_GLEW)
|
||||
-mark_as_advanced (LIB_jpeg LIB_png LIB_zlib)
|
||||
+mark_as_advanced (LIB_jpeg)
|
||||
|
||||
#######################################################################
|
||||
# functions
|
||||
16
externals/vcpkg/ports/fltk/fix-system-link.patch
vendored
Executable file
16
externals/vcpkg/ports/fltk/fix-system-link.patch
vendored
Executable file
@@ -0,0 +1,16 @@
|
||||
diff --git a/CMake/fl_add_library.cmake b/CMake/fl_add_library.cmake
|
||||
index 6fa2fc5..e5ba493 100644
|
||||
--- a/CMake/fl_add_library.cmake
|
||||
+++ b/CMake/fl_add_library.cmake
|
||||
@@ -38,6 +38,11 @@ macro (FL_ADD_LIBRARY LIBNAME LIBTYPE LIBFILES)
|
||||
add_library(${TARGET_NAME} ${LIBTYPE} ${LIBFILES})
|
||||
|
||||
target_include_directories(${TARGET_NAME} PUBLIC $<INSTALL_INTERFACE:include>)
|
||||
+
|
||||
+ if (APPLE)
|
||||
+ find_library(Cocoa Cocoa)
|
||||
+ target_link_libraries(${TARGET_NAME} $<$<PLATFORM_ID:Darwin>:${Cocoa}>)
|
||||
+ endif()
|
||||
|
||||
# target properties for all libraries
|
||||
|
||||
13
externals/vcpkg/ports/fltk/include.patch
vendored
Executable file
13
externals/vcpkg/ports/fltk/include.patch
vendored
Executable file
@@ -0,0 +1,13 @@
|
||||
diff --git a/CMake/fl_add_library.cmake b/CMake/fl_add_library.cmake
|
||||
index 29baa95..6fa2fc5 100644
|
||||
--- a/CMake/fl_add_library.cmake
|
||||
+++ b/CMake/fl_add_library.cmake
|
||||
@@ -36,6 +36,8 @@ macro (FL_ADD_LIBRARY LIBNAME LIBTYPE LIBFILES)
|
||||
endif (MSVC)
|
||||
|
||||
add_library(${TARGET_NAME} ${LIBTYPE} ${LIBFILES})
|
||||
+
|
||||
+ target_include_directories(${TARGET_NAME} PUBLIC $<INSTALL_INTERFACE:include>)
|
||||
|
||||
# target properties for all libraries
|
||||
|
||||
86
externals/vcpkg/ports/fltk/portfile.cmake
vendored
Executable file
86
externals/vcpkg/ports/fltk/portfile.cmake
vendored
Executable file
@@ -0,0 +1,86 @@
|
||||
# FLTK has many improperly shared global variables that get duplicated into every DLL
|
||||
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
||||
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO fltk/fltk
|
||||
REF release-1.3.8
|
||||
SHA512 197848d3b80a65cca936daf4f0b74609f0fe8332a4cd11af53385fb2aa45ad698b1e239a48732b118cd3cb189bc531711b72fb2eeeb85be887dc6c5a558fa4b3
|
||||
PATCHES
|
||||
findlibsfix.patch
|
||||
config-path.patch
|
||||
include.patch
|
||||
fix-system-link.patch
|
||||
)
|
||||
|
||||
if (VCPKG_TARGET_ARCHITECTURE MATCHES "arm" OR VCPKG_TARGET_ARCHITECTURE MATCHES "arm64")
|
||||
set(OPTION_USE_GL "-DOPTION_USE_GL=OFF")
|
||||
else()
|
||||
set(OPTION_USE_GL "-DOPTION_USE_GL=ON")
|
||||
endif()
|
||||
|
||||
set(fluid_path_param "")
|
||||
if(VCPKG_CROSSCOMPILING)
|
||||
set(fluid_path_param "-DFLUID_PATH=${CURRENT_HOST_INSTALLED_DIR}/tools/fltk/fluid${VCPKG_HOST_EXECUTABLE_SUFFIX}")
|
||||
endif()
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS
|
||||
-DFLTK_BUILD_TEST=OFF
|
||||
-DOPTION_LARGE_FILE=ON
|
||||
-DOPTION_USE_THREADS=ON
|
||||
-DOPTION_USE_SYSTEM_ZLIB=ON
|
||||
-DOPTION_USE_SYSTEM_LIBPNG=ON
|
||||
-DOPTION_USE_SYSTEM_LIBJPEG=ON
|
||||
-DOPTION_BUILD_SHARED_LIBS=OFF
|
||||
-DFLTK_CONFIG_PATH=share/fltk
|
||||
${fluid_path_param}
|
||||
${OPTION_USE_GL}
|
||||
)
|
||||
|
||||
vcpkg_cmake_install()
|
||||
|
||||
vcpkg_cmake_config_fixup()
|
||||
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
# don't install fluid
|
||||
if(VCPKG_CROSSCOMPILING)
|
||||
if(NOT VCPKG_TARGET_IS_WINDOWS)
|
||||
vcpkg_copy_tools(TOOL_NAMES fltk-config AUTO_CLEAN)
|
||||
endif()
|
||||
elseif(VCPKG_TARGET_IS_OSX)
|
||||
vcpkg_copy_tools(TOOL_NAMES fluid.app fltk-config AUTO_CLEAN)
|
||||
elseif(VCPKG_TARGET_IS_WINDOWS)
|
||||
file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/fltk-config" "${CURRENT_PACKAGES_DIR}/debug/bin/fltk-config")
|
||||
vcpkg_copy_tools(TOOL_NAMES fluid AUTO_CLEAN)
|
||||
else()
|
||||
vcpkg_copy_tools(TOOL_NAMES fluid fltk-config AUTO_CLEAN)
|
||||
endif()
|
||||
if(EXISTS "${CURRENT_PACKAGES_DIR}/tools/fltk/fltk-config")
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/fltk/fltk-config" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/../..")
|
||||
endif()
|
||||
|
||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
|
||||
file(REMOVE_RECURSE
|
||||
"${CURRENT_PACKAGES_DIR}/debug/bin"
|
||||
"${CURRENT_PACKAGES_DIR}/bin"
|
||||
)
|
||||
endif()
|
||||
file(REMOVE_RECURSE
|
||||
"${CURRENT_PACKAGES_DIR}/debug/include"
|
||||
"${CURRENT_PACKAGES_DIR}/debug/share"
|
||||
)
|
||||
|
||||
foreach(FILE Fl_Export.H fl_utf8.h)
|
||||
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/FL/${FILE}" "defined(FL_DLL)" "0")
|
||||
else()
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/FL/${FILE}" "defined(FL_DLL)" "1")
|
||||
endif()
|
||||
endforeach()
|
||||
|
||||
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/fltk/UseFLTK.cmake" "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel;${SOURCE_PATH}" [[${CMAKE_CURRENT_LIST_DIR}/../../include]])
|
||||
|
||||
file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||
25
externals/vcpkg/ports/fltk/vcpkg.json
vendored
Executable file
25
externals/vcpkg/ports/fltk/vcpkg.json
vendored
Executable file
@@ -0,0 +1,25 @@
|
||||
{
|
||||
"name": "fltk",
|
||||
"version": "1.3.8",
|
||||
"port-version": 2,
|
||||
"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.",
|
||||
"homepage": "https://www.fltk.org/",
|
||||
"supports": "!uwp",
|
||||
"dependencies": [
|
||||
{
|
||||
"name": "fltk",
|
||||
"host": true
|
||||
},
|
||||
"libjpeg-turbo",
|
||||
"libpng",
|
||||
{
|
||||
"name": "vcpkg-cmake",
|
||||
"host": true
|
||||
},
|
||||
{
|
||||
"name": "vcpkg-cmake-config",
|
||||
"host": true
|
||||
},
|
||||
"zlib"
|
||||
]
|
||||
}
|
||||
Reference in New Issue
Block a user