From 69ec698e41efbba438c1a758a63a097f19fa0a1f Mon Sep 17 00:00:00 2001 From: Manolo Gouy Date: Thu, 31 Dec 2015 06:19:59 +0000 Subject: Mac OS: modified CMake config files to allow use of OPTION_APPLE_X11 to build an X11-using version of FLTK on the Mac OS platform. This matches the recent support of the --enable-x11 option by the configure script on the mac. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10986 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- CMake/setup.cmake | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'CMake/setup.cmake') diff --git a/CMake/setup.cmake b/CMake/setup.cmake index c3cd00d13..2befc1fa3 100644 --- a/CMake/setup.cmake +++ b/CMake/setup.cmake @@ -80,7 +80,7 @@ endif(NOT WIN32) # set where config files go if(WIN32 AND NOT CYGWIN) set(FLTK_CONFIG_PATH CMake) -elseif(APPLE) +elseif(APPLE AND NOT OPTION_APPLE_X11) set(FLTK_CONFIG_PATH FLTK/.framework/Resources/CMake) else() set(FLTK_CONFIG_PATH ${FLTK_DATADIR}/fltk) @@ -90,15 +90,20 @@ include(TestBigEndian) TEST_BIG_ENDIAN(WORDS_BIGENDIAN) if(APPLE) - set(__APPLE_QUARTZ__ 1) set(HAVE_STRCASECMP 1) set(HAVE_DIRENT_H 1) set(HAVE_SNPRINTF 1) set(HAVE_VSNPRINTF 1) set(HAVE_SCANDIR 1) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework Cocoa") - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -framework Cocoa") + if(OPTION_APPLE_X11) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -U__APPLE__") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -U__APPLE__") + else() + set(__APPLE_QUARTZ__ 1) + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework Cocoa") + set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -framework Cocoa") + endif(OPTION_APPLE_X11) endif(APPLE) if(WIN32) -- cgit v1.2.3