Djam/cmake
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/cmake.git synced 2025-02-23 14:52:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Re-diff FLTK patch

Browse source
This commit is contained in:
Andrey Bondrov 2016-08-26 20:14:39 +10:00
parent 0ac621a1e8
commit 000bcbf2c7
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
cmake-3.6.1-fltk133.patch
View file

@ -1,6 +1,6 @@
diff -urN cmake-3.6.1/Modules/FindFLTK.cmake cmake-3.6.1-patched/Modules/FindFLTK.cmake
--- cmake-3.6.1/Modules/FindFLTK.cmake 2016-08-26 17:44:31.178040869 +1000
+++ cmake-3.6.1-patched/Modules/FindFLTK.cmake 2016-08-26 19:54:37.860716868 +1000
--- cmake-3.6.1/Modules/FindFLTK.cmake 2016-07-22 23:50:22.000000000 +1000
+++ cmake-3.6.1-patched/Modules/FindFLTK.cmake 2016-08-26 20:14:13.339818656 +1000
@@ -92,9 +92,9 @@
set( FLTK_PLATFORM_DEPENDENT_LIBS "-framework Carbon -framework Cocoa -framework ApplicationServices -lz")
endif()
@ -20,9 +20,9 @@ diff -urN cmake-3.6.1/Modules/FindFLTK.cmake cmake-3.6.1-patched/Modules/FindFLT
/usr/lib/fltk
+ /usr/lib64/fltk
/usr/local/fltk
/usr/X11R6/include
# Help the user find it if we cannot.
@@ -157,7 +158,7 @@
@@ -158,7 +159,7 @@
endif()
# mark_as_advanced(FLTK_FLUID_EXECUTABLE)
@ -31,7 +31,7 @@ diff -urN cmake-3.6.1/Modules/FindFLTK.cmake cmake-3.6.1-patched/Modules/FindFLT
link_directories(${FLTK_LIBRARY_DIRS})
set(FLTK_BASE_LIBRARY fltk)
@@ -165,14 +166,6 @@
@@ -166,14 +167,6 @@
set(FLTK_FORMS_LIBRARY fltk_forms)
set(FLTK_IMAGES_LIBRARY fltk_images)
@ -46,7 +46,7 @@ diff -urN cmake-3.6.1/Modules/FindFLTK.cmake cmake-3.6.1-patched/Modules/FindFLT
set(FLTK_IMAGES_LIBS "")
if(FLFLTK_USE_SYSTEM_JPEG)
set(FLTK_IMAGES_LIBS ${FLTK_IMAGES_LIBS} fltk_jpeg)
@@ -190,7 +183,7 @@
@@ -191,7 +184,7 @@
# if FLTK was not built using CMake
# Find fluid executable.
@ -55,7 +55,7 @@ diff -urN cmake-3.6.1/Modules/FindFLTK.cmake cmake-3.6.1-patched/Modules/FindFLT
# Use location of fluid to help find everything else.
set(FLTK_INCLUDE_SEARCH_PATH "")
@@ -211,7 +204,7 @@
@@ -212,7 +205,7 @@
# Use fltk-config to generate a list of possible include directories
find_program(FLTK_CONFIG_SCRIPT fltk-config PATHS ${FLTK_BIN_DIR})
if(FLTK_CONFIG_SCRIPT)
@ -64,7 +64,7 @@ diff -urN cmake-3.6.1/Modules/FindFLTK.cmake cmake-3.6.1-patched/Modules/FindFLT
exec_program(${FLTK_CONFIG_SCRIPT} ARGS --cxxflags OUTPUT_VARIABLE FLTK_CXXFLAGS)
if(FLTK_CXXFLAGS)
string(REGEX MATCHALL "-I[^ ]*" _fltk_temp_dirs ${FLTK_CXXFLAGS})
@@ -230,7 +223,7 @@
@@ -232,7 +225,7 @@
${_FLTK_POSSIBLE_INCLUDE_DIRS}
)
@ -73,16 +73,16 @@ diff -urN cmake-3.6.1/Modules/FindFLTK.cmake cmake-3.6.1-patched/Modules/FindFLT
NAMES FL/Fl.h FL/Fl.H # fltk 1.1.9 has Fl.H (#8376)
PATHS ${FLTK_INCLUDE_SEARCH_PATH})
@@ -247,7 +240,7 @@
@@ -250,7 +243,7 @@
set(FLTK_LIBRARY_SEARCH_PATH ${FLTK_LIBRARY_SEARCH_PATH}
/usr/local/fltk/lib
/usr/X11R6/lib
- ${FLTK_INCLUDE_DIR}/lib
+ ${FLTK_INCLUDE_DIRS}/lib
${_FLTK_POSSIBLE_LIBRARY_DIR}
)
@@ -288,16 +281,16 @@
@@ -291,16 +284,16 @@
endif()
if(NOT FLTK_SKIP_OPENGL)
list(APPEND FLTK_LIBRARIES ${FLTK_GL_LIBRARY} ${OPENGL_gl_LIBRARY})
@ -103,7 +103,7 @@ diff -urN cmake-3.6.1/Modules/FindFLTK.cmake cmake-3.6.1-patched/Modules/FindFLT
endif()
if(FLTK_FOUND)
@@ -309,7 +302,7 @@
@@ -312,7 +305,7 @@
# The following deprecated settings are for compatibility with CMake 1.4
set (HAS_FLTK ${FLTK_FOUND})