|
|
commit 1f20806466e8a1adff85aa327dfb50665d9a7948
Author: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
AuthorDate: Thu Aug 27 17:49:10 2020 +0200
Commit: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
CommitDate: Thu Aug 27 17:49:10 2020 +0200
Remove VERSION_GREATER_EQUAL that requires a more recent CMake version than 3.2.3
Replace it by (NOT VERSION_LESS)
CMake/options.cmake | 4 ++--
CMake/setup.cmake | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git CMake/options.cmake CMake/options.cmake
index e7eac47..d6184fe 100644
--- CMake/options.cmake
+++ CMake/options.cmake
@@ -74,9 +74,9 @@ if ((NOT APPLE OR OPTION_APPLE_X11) AND NOT WIN32)
endif ((NOT APPLE OR OPTION_APPLE_X11) AND NOT WIN32)
if (OPTION_APPLE_X11)
- if (${CMAKE_SYSTEM_VERSION} VERSION_GREATER_EQUAL 17.0.0) # a.k.a. macOS version â?¥ 10.13
+ if (NOT(${CMAKE_SYSTEM_VERSION} VERSION_LESS 17.0.0)) # a.k.a. macOS version â?¥ 10.13
list (APPEND FLTK_CFLAGS "-D_LIBCPP_HAS_THREAD_API_PTHREAD")
- endif (${CMAKE_SYSTEM_VERSION} VERSION_GREATER_EQUAL 17.0.0)
+ endif (NOT(${CMAKE_SYSTEM_VERSION} VERSION_LESS 17.0.0))
include_directories (AFTER SYSTEM /opt/X11/include/freetype2)
if (PATH_TO_XLIBS)
set (LDFLAGS "-L${PATH_TO_XLIBS} ${LDFLAGS}")
diff --git CMake/setup.cmake CMake/setup.cmake
index db661a5..2be2aac 100644
--- CMake/setup.cmake
+++ CMake/setup.cmake
@@ -78,9 +78,9 @@ if (APPLE)
if (OPTION_APPLE_X11)
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -U__APPLE__")
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -U__APPLE__")
- if (${CMAKE_SYSTEM_VERSION} VERSION_GREATER 16.9.0)
+ if (NOT(${CMAKE_SYSTEM_VERSION} VERSION_LESS 17.0.0)) # a.k.a. macOS version â?¥ 10.13
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_LIBCPP_HAS_THREAD_API_PTHREAD")
- endif (${CMAKE_SYSTEM_VERSION} VERSION_GREATER 16.9.0)
+ endif (NOT(${CMAKE_SYSTEM_VERSION} VERSION_LESS 17.0.0))
elseif (OPTION_APPLE_SDL)
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SDL2_INCLUDE_DIRS} -U__APPLE__")
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SDL2_INCLUDE_DIRS} -U__APPLE__")
[ Direct Link to Message ] | |
|
| |