diff options
| author | Manolo Gouy <Manolo> | 2015-12-31 06:19:59 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2015-12-31 06:19:59 +0000 |
| commit | 69ec698e41efbba438c1a758a63a097f19fa0a1f (patch) | |
| tree | 011720a8cf865dc951388bfde1d2fef7dd5f2528 /CMake | |
| parent | 3beb45165a4e3aac8ab6a6a4add93eb4cd48eceb (diff) | |
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
Diffstat (limited to 'CMake')
| -rw-r--r-- | CMake/macros.cmake | 8 | ||||
| -rw-r--r-- | CMake/options.cmake | 4 | ||||
| -rw-r--r-- | CMake/setup.cmake | 13 |
3 files changed, 17 insertions, 8 deletions
diff --git a/CMake/macros.cmake b/CMake/macros.cmake index aa76375f4..fe9942575 100644 --- a/CMake/macros.cmake +++ b/CMake/macros.cmake @@ -102,7 +102,7 @@ macro(CREATE_EXAMPLE NAME SOURCES LIBRARIES) fltk_wrap_ui(${tname} ${flsrcs}) endif(flsrcs) - if(APPLE) + if(APPLE AND NOT OPTION_APPLE_X11) unset(RESOURCE_PATH) if(${tname} STREQUAL "blocks" OR ${tname} STREQUAL "checkers" OR ${tname} STREQUAL "sudoku") set( ICON_NAME ${tname}.icns ) @@ -121,7 +121,7 @@ macro(CREATE_EXAMPLE NAME SOURCES LIBRARIES) endif(DEFINED RESOURCE_PATH) else() add_executable(${tname} WIN32 ${srcs} ${${tname}_FLTK_UI_SRCS}) - endif(APPLE) + endif(APPLE AND NOT OPTION_APPLE_X11) set_target_properties(${tname} PROPERTIES OUTPUT_NAME ${oname} @@ -132,9 +132,9 @@ macro(CREATE_EXAMPLE NAME SOURCES LIBRARIES) endif(NOT ${tname} STREQUAL "demo") set_target_properties(${tname} PROPERTIES RESOURCE ${RESOURCE_PATH}) endif(APPLE AND DEFINED RESOURCE_PATH) - if(APPLE AND ${tname} STREQUAL "editor") + if(APPLE AND (NOT OPTION_APPLE_X11) AND ${tname} STREQUAL "editor") set_target_properties("editor" PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${PROJECT_SOURCE_DIR}/ide/Xcode4/plists/editor-Info.plist" ) - endif(APPLE AND ${tname} STREQUAL "editor") + endif(APPLE AND (NOT OPTION_APPLE_X11) AND ${tname} STREQUAL "editor") target_link_libraries(${tname} ${LIBRARIES}) diff --git a/CMake/options.cmake b/CMake/options.cmake index 0aa687fef..49d94070c 100644 --- a/CMake/options.cmake +++ b/CMake/options.cmake @@ -128,6 +128,10 @@ if(HAVE_GL) endif(HAVE_GL) if(OPTION_USE_GL) + if(OPTION_APPLE_X11) + find_library(OPENGL_gl_LIBRARY GL) + find_library(OPENGL_glu_LIBRARY GLU) + endif(OPTION_APPLE_X11) include(FindOpenGL) endif(OPTION_USE_GL) 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) |