mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 18:31:15 +08:00
[fltk] update to 1.3.9 (#35981)
This commit is contained in:
Mengna Li
GitHub
parent
8f4ba99ace
commit
00d7b89c77
@ -1,26 +1,53 @@
|
||||
diff --git a/CMake/options.cmake b/CMake/options.cmake
|
||||
index ddd650f..69bcc2e 100644
|
||||
index d1e299f..d20e9c8 100644
|
||||
--- a/CMake/options.cmake
|
||||
+++ b/CMake/options.cmake
|
||||
@@ -63,7 +63,7 @@ endif (APPLE)
|
||||
@@ -101,11 +101,14 @@ endif ()
|
||||
#######################################################################
|
||||
|
||||
if (OPTION_USE_SYSTEM_ZLIB)
|
||||
- find_package (ZLIB)
|
||||
+ find_package(ZLIB REQUIRED)
|
||||
+ set(LIB_zlib "${ZLIB_LIBRARIES}" CACHE INTERNAL "")
|
||||
endif ()
|
||||
|
||||
if (OPTION_USE_SYSTEM_LIBPNG)
|
||||
- find_package (PNG)
|
||||
+ find_package(PNG REQUIRED)
|
||||
+ set(HAVE_PNG_H "${PNG_FOUND}")
|
||||
+ set(LIB_png "${PNG_LIBRARIES}" CACHE INTERNAL "")
|
||||
endif ()
|
||||
|
||||
# If we use the system zlib, we must also use the system png zlib and vice versa
|
||||
@@ -148,7 +151,8 @@ set (HAVE_LIBZ 1)
|
||||
#######################################################################
|
||||
|
||||
if (OPTION_USE_SYSTEM_LIBJPEG)
|
||||
- find_package (JPEG)
|
||||
+ find_package(JPEG REQUIRED)
|
||||
+ set(LIB_jpeg "${JPEG_LIBRARIES}" CACHE INTERNAL "")
|
||||
endif ()
|
||||
|
||||
if (OPTION_USE_SYSTEM_LIBJPEG AND JPEG_FOUND)
|
||||
@@ -228,7 +232,7 @@ endif (APPLE)
|
||||
# find X11 libraries and headers
|
||||
set (PATH_TO_XLIBS)
|
||||
if ((NOT APPLE OR OPTION_APPLE_X11) AND NOT WIN32)
|
||||
if (NOT APPLE AND NOT WIN32)
|
||||
- include (FindX11)
|
||||
+ find_package(X11)
|
||||
if (X11_FOUND)
|
||||
set (USE_X11 1)
|
||||
list (APPEND FLTK_LDLIBS -lX11)
|
||||
@@ -214,7 +214,7 @@ if (OPTION_USE_GL)
|
||||
unset(HAVE_GL_GLU_H CACHE)
|
||||
find_file (HAVE_GL_GLU_H GL/glu.h PATHS ${X11_INCLUDE_DIR})
|
||||
else()
|
||||
- include (FindOpenGL)
|
||||
+ find_package(OpenGL REQUIRED)
|
||||
if (APPLE)
|
||||
set (HAVE_GL_GLU_H ${HAVE_OPENGL_GLU_H})
|
||||
endif (APPLE)
|
||||
@@ -285,7 +285,7 @@ set (FLTK_PTHREADS_FOUND FALSE)
|
||||
@@ -351,7 +355,7 @@ if (HAVE_GL)
|
||||
endif (HAVE_GL)
|
||||
|
||||
if (OPTION_USE_GL)
|
||||
- include (FindOpenGL)
|
||||
+ find_package(OpenGL REQUIRED)
|
||||
if (APPLE)
|
||||
set (HAVE_GL_GLU_H ${HAVE_OPENGL_GLU_H})
|
||||
endif (APPLE)
|
||||
@@ -421,7 +425,7 @@ set (FLTK_PTHREADS_FOUND FALSE)
|
||||
|
||||
if (OPTION_USE_THREADS)
|
||||
|
||||
@ -29,39 +56,8 @@ index ddd650f..69bcc2e 100644
|
||||
|
||||
if (CMAKE_HAVE_THREADS_LIBRARY)
|
||||
add_definitions ("-D_THREAD_SAFE -D_REENTRANT")
|
||||
@@ -330,7 +330,8 @@ unset (debug_threads)
|
||||
option (OPTION_USE_SYSTEM_ZLIB "use system zlib" ON)
|
||||
|
||||
if (OPTION_USE_SYSTEM_ZLIB)
|
||||
- include (FindZLIB)
|
||||
+ find_package(ZLIB REQUIRED)
|
||||
+ set(LIB_zlib "${ZLIB_LIBRARIES}" CACHE INTERNAL "")
|
||||
endif (OPTION_USE_SYSTEM_ZLIB)
|
||||
|
||||
if (ZLIB_FOUND)
|
||||
@@ -359,7 +360,8 @@ else ()
|
||||
endif (APPLE)
|
||||
|
||||
if (OPTION_USE_SYSTEM_LIBJPEG)
|
||||
- include (FindJPEG)
|
||||
+ find_package(JPEG REQUIRED)
|
||||
+ set(LIB_jpeg "${JPEG_LIBRARIES}" CACHE INTERNAL "")
|
||||
endif (OPTION_USE_SYSTEM_LIBJPEG)
|
||||
|
||||
if (JPEG_FOUND)
|
||||
@@ -387,7 +389,9 @@ else ()
|
||||
endif (APPLE)
|
||||
|
||||
if (OPTION_USE_SYSTEM_LIBPNG)
|
||||
- include (FindPNG)
|
||||
+ find_package(PNG REQUIRED)
|
||||
+ set(HAVE_PNG_H "${PNG_FOUND}")
|
||||
+ set(LIB_png "${PNG_LIBRARIES}" CACHE INTERNAL "")
|
||||
endif (OPTION_USE_SYSTEM_LIBPNG)
|
||||
|
||||
if (PNG_FOUND)
|
||||
diff --git a/CMake/resources.cmake b/CMake/resources.cmake
|
||||
index 57173f2..734a528 100644
|
||||
index a763fb6..5fdb3d5 100644
|
||||
--- a/CMake/resources.cmake
|
||||
+++ b/CMake/resources.cmake
|
||||
@@ -39,7 +39,7 @@ endmacro (fl_find_header)
|
||||
@ -73,7 +69,7 @@ index 57173f2..734a528 100644
|
||||
|
||||
# fl_debug_var (PKG_CONFIG_FOUND)
|
||||
# fl_debug_var (PKG_CONFIG_EXECUTABLE)
|
||||
@@ -151,8 +151,7 @@ mark_as_advanced (HAVE_X11_XREGION_H)
|
||||
@@ -131,8 +131,7 @@ mark_as_advanced (HAVE_X11_XREGION_H)
|
||||
|
||||
# where to find freetype headers
|
||||
|
||||
@ -83,19 +79,19 @@ index 57173f2..734a528 100644
|
||||
|
||||
if (FREETYPE_PATH)
|
||||
include_directories (${FREETYPE_PATH})
|
||||
@@ -162,11 +161,12 @@ mark_as_advanced (FREETYPE_PATH)
|
||||
@@ -142,11 +141,12 @@ mark_as_advanced (FREETYPE_PATH)
|
||||
|
||||
#######################################################################
|
||||
# libraries
|
||||
-find_library (LIB_dl dl)
|
||||
+set(LIB_dl "${CMAKE_DL_LIBS}" CACHE STRING "")
|
||||
if ((NOT APPLE) OR OPTION_APPLE_X11)
|
||||
if (NOT APPLE)
|
||||
- find_library (LIB_fontconfig fontconfig)
|
||||
+ find_package(Fontconfig REQUIRED)
|
||||
+ set(LIB_fontconfig "${Fontconfig_LIBRARIES}" CACHE INTERNAL "")
|
||||
endif ((NOT APPLE) OR OPTION_APPLE_X11)
|
||||
endif (NOT APPLE)
|
||||
-find_library (LIB_freetype freetype)
|
||||
+set(LIB_freetype "" CACHE INTERNAL "Obsolete")
|
||||
find_library (LIB_GL GL)
|
||||
find_library (LIB_MesaGL MesaGL)
|
||||
find_library (LIB_GLEW GLEW)
|
||||
find_library (LIB_GLEW NAMES GLEW glew32)
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/fluid/ExternalCodeEditor_WIN32.cxx b/fluid/ExternalCodeEditor_WIN32.cxx
|
||||
index 4646fe5..3b7f693 100644
|
||||
--- a/fluid/ExternalCodeEditor_WIN32.cxx
|
||||
+++ b/fluid/ExternalCodeEditor_WIN32.cxx
|
||||
@@ -474,7 +474,7 @@ void ExternalCodeEditor::reap_cleanup() {
|
||||
int ExternalCodeEditor::reap_editor(DWORD *pid_reaped) {
|
||||
if ( pid_reaped ) *pid_reaped = 0;
|
||||
if ( !is_editing() ) return -2;
|
||||
- int err;
|
||||
+ DWORD err;
|
||||
DWORD msecs_wait = 50; // .05 sec
|
||||
switch ( err = WaitForSingleObject(pinfo_.hProcess, msecs_wait) ) {
|
||||
case WAIT_TIMEOUT: { // process didn't reap, still running
|
||||
@ -1,16 +1,16 @@
|
||||
diff --git a/CMake/fl_add_library.cmake b/CMake/fl_add_library.cmake
|
||||
index 6fa2fc5..e5ba493 100644
|
||||
index 7e3490b..682a000 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})
|
||||
|
||||
@@ -39,6 +39,11 @@ macro (FL_ADD_LIBRARY LIBNAME 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
|
||||
|
||||
set_target_properties(${TARGET_NAME}
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
diff --git a/CMake/fl_add_library.cmake b/CMake/fl_add_library.cmake
|
||||
index 29baa95..6fa2fc5 100644
|
||||
index 29baa95..7e3490b 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)
|
||||
@@ -37,6 +37,8 @@ macro (FL_ADD_LIBRARY LIBNAME LIBTYPE LIBFILES)
|
||||
|
||||
add_library(${TARGET_NAME} ${LIBTYPE} ${LIBFILES})
|
||||
+
|
||||
+ target_include_directories(${TARGET_NAME} PUBLIC $<INSTALL_INTERFACE:include>)
|
||||
|
||||
+ target_include_directories(${TARGET_NAME} PUBLIC $<INSTALL_INTERFACE:include>)
|
||||
+
|
||||
# target properties for all libraries
|
||||
|
||||
set_target_properties(${TARGET_NAME}
|
||||
|
||||
@ -4,15 +4,14 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO fltk/fltk
|
||||
REF release-1.3.8
|
||||
SHA512 197848d3b80a65cca936daf4f0b74609f0fe8332a4cd11af53385fb2aa45ad698b1e239a48732b118cd3cb189bc531711b72fb2eeeb85be887dc6c5a558fa4b3
|
||||
REF "release-${VERSION}"
|
||||
SHA512 2dfeeed9fdc6db62a6620e7c846dbe0bf97dacce3077832e314a35bf16ba6a45803373188a7b3954eada5829385b9914241270b71f12aaf3e9e3df45eb2b1b95
|
||||
PATCHES
|
||||
dependencies.patch
|
||||
config-path.patch
|
||||
include.patch
|
||||
fix-system-link.patch
|
||||
math-h-polyfill.patch
|
||||
fix-narrow.patch
|
||||
)
|
||||
file(REMOVE_RECURSE
|
||||
"${SOURCE_PATH}/jpeg"
|
||||
@ -31,6 +30,11 @@ if(VCPKG_CROSSCOMPILING)
|
||||
set(fluid_path_param "-DFLUID_PATH=${CURRENT_HOST_INSTALLED_DIR}/tools/fltk/fluid${VCPKG_HOST_EXECUTABLE_SUFFIX}")
|
||||
endif()
|
||||
|
||||
set(runtime_dll "ON")
|
||||
if(VCPKG_CRT_LINKAGE STREQUAL "static")
|
||||
set(runtime_dll "OFF")
|
||||
endif()
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
OPTIONS
|
||||
@ -45,6 +49,7 @@ vcpkg_cmake_configure(
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=1
|
||||
"-DCocoa:STRING=-framework Cocoa" # avoid absolute path
|
||||
${fluid_path_param}
|
||||
-DFLTK_MSVC_RUNTIME_DLL=${runtime_dll}
|
||||
MAYBE_UNUSED_VARIABLES
|
||||
Cocoa
|
||||
)
|
||||
|
||||
@ -1,7 +1,6 @@
|
||||
{
|
||||
"name": "fltk",
|
||||
"version": "1.3.8",
|
||||
"port-version": 5,
|
||||
"version": "1.3.9",
|
||||
"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/",
|
||||
"license": null,
|
||||
|
||||
@ -2685,8 +2685,8 @@
|
||||
"port-version": 0
|
||||
},
|
||||
"fltk": {
|
||||
"baseline": "1.3.8",
|
||||
"port-version": 5
|
||||
"baseline": "1.3.9",
|
||||
"port-version": 0
|
||||
},
|
||||
"fluidlite": {
|
||||
"baseline": "2023-04-18",
|
||||
|
||||
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "171647047716e78f2a85309b6d3b8cb7ca1309c9",
|
||||
"version": "1.3.9",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "bb00fc235046a91ebcdb47e9bcb4474b82cb81d8",
|
||||
"version": "1.3.8",
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user