blob: ee933b46b4dfc8e3879f6b7b4ebe85fb45b0751c (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
|
The "CFLAGS" variable here concatenates user's CFLAGS (unwanted in
fltk-config's @CFLAGS@) and FLTK_CFLAGS a bit below (wanted).
So prevent addition of CMAKE_C_FLAGS_* and keep the rest.
CXXFLAGS not touched given it does set(CXXFLAGS "${CFLAGS}").
Also drop @LDFLAGS@ as a precaution, it's not currently set by cmake
but it's likely an oversight. @LARGEFILE@ (currently still in .in) and
such are only used by autoconf (cmake appends into @CFLAGS@).
--- a/CMake/variables.cmake
+++ b/CMake/variables.cmake
@@ -139,6 +139 @@
-string(TOUPPER "${CMAKE_BUILD_TYPE}" BUILD_UPPER)
-if(${BUILD_UPPER})
- set(CFLAGS "${CMAKE_C_FLAGS_${BUILD_UPPER}} ${CFLAGS}")
-endif(${BUILD_UPPER})
-
-set(CFLAGS "${FLTK_OPTION_OPTIM} ${CMAKE_C_FLAGS} ${CFLAGS}")
+set(CFLAGS "${FLTK_OPTION_OPTIM} ${CFLAGS}")
--- a/fltk-config.in
+++ b/fltk-config.in
@@ -38 +38 @@
-LDFLAGS="@LDFLAGS@"
+LDFLAGS=""
|
