FLTK logo

[master] 87b799b - make + macOS: further fix to the construction of fltk-config

FLTK matrix user chat room
(using Element browser app)   FLTK gitter user chat room   GitHub FLTK Project   FLTK News RSS Feed  
  FLTK Apps      FLTK Library      Forums      Links     Login 
 All Forums  |  Back to fltk.commit  ]
 
Previous Message ]Next Message ]

[master] 87b799b - make + macOS: further fix to the construction of fltk-config "ManoloFLTK" Aug 31, 2020  
 
commit 87b799ba07070cfd4ce574545819d3729deb152b
Author:     ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
AuthorDate: Mon Aug 31 12:34:37 2020 +0200
Commit:     ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
CommitDate: Mon Aug 31 12:35:25 2020 +0200

    make + macOS: further fix to the construction of fltk-config

 CMake/options.cmake | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git CMake/options.cmake CMake/options.cmake
index d6184fe..0153a19 100644
--- CMake/options.cmake
+++ CMake/options.cmake
@@ -56,7 +56,9 @@ endif (UNIX)
 if (APPLE)
   option (OPTION_APPLE_X11 "use X11" OFF)
   option (OPTION_APPLE_SDL "use SDL" OFF)
-  list (APPEND FLTK_CFLAGS "-isysroot ${CMAKE_OSX_SYSROOT}")
+  if (CMAKE_OSX_SYSROOT)
+    list (APPEND FLTK_CFLAGS "-isysroot ${CMAKE_OSX_SYSROOT}")
+  endif (CMAKE_OSX_SYSROOT)
 endif (APPLE)
 
 # find X11 libraries and headers
@@ -470,7 +472,7 @@ if (X11_Xft_FOUND AND OPTION_USE_PANGO)
     list (APPEND FLTK_LDLIBS -lpango-1.0 -lpangoxft-1.0 -lgobject-2.0)
     if (APPLE)
       get_filename_component(PANGO_L_PATH ${HAVE_LIB_PANGO} PATH)
-      set (LDFLAGS "${LDFLAGS} -isysroot ${CMAKE_OSX_SYSROOT} -L${PANGO_L_PATH}")
+      set (LDFLAGS "${LDFLAGS} -L${PANGO_L_PATH}")
     endif (APPLE)
   else(PANGOXFT_FOUND)
 
Direct Link to Message ]
 
     
Previous Message ]Next Message ]
 
 

Comments are owned by the poster. All other content is copyright 1998-2024 by Bill Spitzak and others. This project is hosted by The FLTK Team. Please report site problems to 'erco@seriss.com'.