summaryrefslogtreecommitdiff
path: root/CMake
diff options
context:
space:
mode:
authorMatthias Melcher <fltk@matthiasm.com>2018-06-23 17:04:18 +0000
committerMatthias Melcher <fltk@matthiasm.com>2018-06-23 17:04:18 +0000
commitb1598dc70362f331da7a65f1e5ddece7c88299f3 (patch)
treeb86ceda8b546d19b0bb1d4cfc7b8babdd53c3f3c /CMake
parenta9fd08ff5ab8bbf3838200ceace671a72627d212 (diff)
Removed macro FL_PORTING, as it has been more confusing than helpful.
The original intention of FL_PORTING was to mark all places in the source code where changes are required to port FLTK to a new platform. Thanks to the driver system, this approach has become somewhat misleading, so I removed all references. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12969 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'CMake')
-rw-r--r--CMake/options.cmake1
-rw-r--r--CMake/setup.cmake4
2 files changed, 2 insertions, 3 deletions
diff --git a/CMake/options.cmake b/CMake/options.cmake
index 4583a83f1..622c2eb44 100644
--- a/CMake/options.cmake
+++ b/CMake/options.cmake
@@ -115,7 +115,6 @@ if (OPTION_APPLE_SDL)
find_package (SDL2 REQUIRED)
if (SDL2_FOUND)
set (USE_SDL 1)
- set (FL_PORTING 1)
list (APPEND FLTK_LDLIBS SDL2_LIBRARY)
endif (SDL2_FOUND)
endif (OPTION_APPLE_SDL)
diff --git a/CMake/setup.cmake b/CMake/setup.cmake
index bed59722e..23f20695b 100644
--- a/CMake/setup.cmake
+++ b/CMake/setup.cmake
@@ -100,8 +100,8 @@ if(APPLE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.8")
endif(${CMAKE_SYSTEM_VERSION} VERSION_GREATER 16.9.0)
elseif(OPTION_APPLE_SDL)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SDL2_INCLUDE_DIRS} -U__APPLE__ -DFL_PORTING")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SDL2_INCLUDE_DIRS} -U__APPLE__ -DFL_PORTING")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SDL2_INCLUDE_DIRS} -U__APPLE__")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SDL2_INCLUDE_DIRS} -U__APPLE__")
else()
set(__APPLE_QUARTZ__ 1)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework Cocoa")