mirror of
https://abf.rosa.ru/djam/fltk.git
synced 2025-02-23 17:02:52 +00:00
LOG Update linkage patch
This commit is contained in:
parent
1e644c5a3c
commit
61a2d65a00
2 changed files with 20 additions and 6 deletions
|
@ -1,5 +1,6 @@
|
|||
--- cairo/CMakeLists.txt.link 2011-06-18 14:51:32.000000000 +0200
|
||||
+++ cairo/CMakeLists.txt 2011-06-18 14:54:07.000000000 +0200
|
||||
diff -urN fltk-1.3.0/cairo/CMakeLists.txt fltk-1.3.0-patched/cairo/CMakeLists.txt
|
||||
--- fltk-1.3.0/cairo/CMakeLists.txt 2010-04-06 09:33:58.000000000 +1100
|
||||
+++ fltk-1.3.0-patched/cairo/CMakeLists.txt 2012-09-14 01:39:44.173275271 +1100
|
||||
@@ -8,7 +8,7 @@
|
||||
set(cairo_SRCS Fl_Cairo.cxx)
|
||||
|
||||
|
@ -9,8 +10,21 @@
|
|||
|
||||
if(MSVC)
|
||||
set_target_properties(fltk_cairo
|
||||
--- src/CMakeLists.txt.link 2011-06-18 14:59:39.000000000 +0200
|
||||
+++ src/CMakeLists.txt 2011-06-18 15:02:08.000000000 +0200
|
||||
diff -urN fltk-1.3.0/fluid/CMakeLists.txt fltk-1.3.0-patched/fluid/CMakeLists.txt
|
||||
--- fltk-1.3.0/fluid/CMakeLists.txt 2011-01-06 20:24:58.000000000 +1000
|
||||
+++ fltk-1.3.0-patched/fluid/CMakeLists.txt 2012-09-14 01:40:08.347275014 +1100
|
||||
@@ -22,7 +22,7 @@
|
||||
)
|
||||
|
||||
add_executable(fluid ${CPPFILES})
|
||||
-target_link_libraries(fluid fltk fltk_images fltk_forms)
|
||||
+target_link_libraries(fluid fltk fltk_images fltk_forms dl)
|
||||
|
||||
# link in optional libraries
|
||||
if(FLTK_HAVE_CAIRO)
|
||||
diff -urN fltk-1.3.0/src/CMakeLists.txt fltk-1.3.0-patched/src/CMakeLists.txt
|
||||
--- fltk-1.3.0/src/CMakeLists.txt 2011-01-12 19:24:03.000000000 +1000
|
||||
+++ fltk-1.3.0-patched/src/CMakeLists.txt 2012-09-14 01:39:44.173275271 +1100
|
||||
@@ -333,6 +333,8 @@
|
||||
set_target_properties(fltk_SHARED PROPERTIES OUTPUT_NAME fltk)
|
||||
endif(MSVC)
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
Name: fltk
|
||||
Version: 1.3.0
|
||||
Release: 4
|
||||
Release: 5
|
||||
Group: System/Libraries
|
||||
Summary: Fast Light Tool Kit (FLTK)
|
||||
License: LGPLv2+
|
||||
|
@ -89,7 +89,7 @@ linked applications.
|
|||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p0
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
%define Werror_cflags %{nil}
|
||||
|
|
Loading…
Add table
Reference in a new issue