diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2023-11-15 21:30:12 +0100 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2023-11-15 21:30:12 +0100 |
| commit | 6f021d483093a51e736d38e12491fbe5a70d302c (patch) | |
| tree | 16c8f4a677c00e617c842dff8634f0018f619798 /src | |
| parent | ed7c2f1464346c386825b6ef76a507f481604024 (diff) | |
CMake: Raise cmake_minimum_required from 3.12 to 3.15
Remove code that checks CMake versions lower than 3.15
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f9511f358..3e951467e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -644,14 +644,7 @@ if (USE_XFT) endif (USE_XFT) if (UNIX AND OPTION_USE_WAYLAND) - if (NOT (CMAKE_VERSION VERSION_LESS 3.4)) - pkg_get_variable(PROTOCOLS wayland-protocols pkgdatadir) # requires cmake 3.4 - else() - execute_process(COMMAND pkg-config --variable=pkgdatadir wayland-protocols - OUTPUT_VARIABLE PROTOCOLS) - # strip trailing newline - string (REPLACE "\n" "" PROTOCOLS ${PROTOCOLS}) - endif (NOT (CMAKE_VERSION VERSION_LESS 3.4)) + pkg_get_variable(PROTOCOLS wayland-protocols pkgdatadir) # replace "//" with "/" string (REPLACE "//" "/" PROTOCOLS ${PROTOCOLS}) if (NOT(EXISTS ${PROTOCOLS}/stable/xdg-shell/xdg-shell.xml)) @@ -737,7 +730,7 @@ FL_ADD_LIBRARY (fltk STATIC "${STATIC_FILES}") target_link_libraries (fltk ${OPTIONAL_LIBS}) if (FLTK_HAVE_CAIRO) - fl_target_link_directories (fltk PUBLIC "${PKG_CAIRO_LIBRARY_DIRS}") + target_link_directories (fltk PUBLIC ${PKG_CAIRO_LIBRARY_DIRS}) endif() ####################################################################### @@ -785,7 +778,7 @@ if (OPTION_BUILD_SHARED_LIBS AND NOT MSVC) FL_ADD_LIBRARY (fltk SHARED "${SHARED_FILES}") target_link_libraries (fltk_SHARED ${OPTIONAL_LIBS} ${PKG_CAIRO_LIBRARIES}) - fl_target_link_directories (fltk_SHARED PUBLIC "${PKG_CAIRO_LIBRARY_DIRS}") + target_link_directories (fltk_SHARED PUBLIC ${PKG_CAIRO_LIBRARY_DIRS}) ################################################################### |