diff options
| author | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2019-10-31 07:30:39 +0100 |
|---|---|---|
| committer | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2019-10-31 07:30:39 +0100 |
| commit | 9ff6ad78852c88bc34103abaff569c008389e378 (patch) | |
| tree | d3f1640a75e72294917523f45b8499a1f459cbff | |
| parent | 031a7a8414eb05c7e9f218afe37da0ba0041102b (diff) | |
Continue CMake support of the Darwin+XQuartz+fink test platform
| -rw-r--r-- | CMake/options.cmake | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/CMake/options.cmake b/CMake/options.cmake index 4a0c5c2a2..3784314d4 100644 --- a/CMake/options.cmake +++ b/CMake/options.cmake @@ -469,8 +469,7 @@ if(X11_Xft_FOUND AND OPTION_USE_PANGO) if(APPLE AND OPTION_APPLE_X11) find_file(FINK_PREFIX NAMES /opt/sw /sw) list(APPEND CMAKE_INCLUDE_PATH ${FINK_PREFIX}/include) - list(APPEND CMAKE_LIBRARY_PATH /${FINK_PREFIX}/lib) - list (APPEND FLTK_CXXFLAGS "-stdlib=libc++") + list(APPEND CMAKE_LIBRARY_PATH ${FINK_PREFIX}/lib) endif(APPLE AND OPTION_APPLE_X11) find_file(HAVE_PANGO_H pango-1.0/pango/pango.h ${CMAKE_INCLUDE_PATH}) find_file(HAVE_PANGOXFT_H pango-1.0/pango/pangoxft.h ${CMAKE_INCLUDE_PATH}) @@ -501,7 +500,7 @@ if(X11_Xft_FOUND AND OPTION_USE_PANGO) include_directories(${PANGO_H_PREFIX}/pango-1.0 ${GLIB_H_PATH} ${PANGOLIB_DIR}/glib-2.0/include) list(APPEND FLTK_LDLIBS -lpango-1.0 -lpangoxft-1.0 -lgobject-2.0) if (APPLE) - set (LDFLAGS "${LDFLAGS} -L/sw/lib") + set(LDFLAGS "${LDFLAGS} -L${FINK_PREFIX}/lib") endif (APPLE) endif(HAVE_LIB_PANGO AND HAVE_LIB_PANGOXFT AND HAVE_LIB_GOBJECT) endif(X11_Xft_FOUND AND OPTION_USE_PANGO) |