diff options
| author | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2023-12-05 16:09:36 +0100 |
|---|---|---|
| committer | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2023-12-05 16:09:36 +0100 |
| commit | 538ad1828f8e69daee02f35a14dd0ae3d4ba5c31 (patch) | |
| tree | 15d6ba7d875eb3b893a7c8449ce02b80534d71ce | |
| parent | 7bbfa06e38703f8095c07ae919f4f2a587f55da9 (diff) | |
Wayland+CMake: use set_source_files_properties() for libdecor - cont'd
| -rw-r--r-- | src/CMakeLists.txt | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index dcac1ae61..fb90aec75 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -514,27 +514,31 @@ endif (FLTK_USE_X11) if (OPTION_USE_WAYLAND) pkg_check_modules(DBUS dbus-1) - include_directories(${DBUS_INCLUDE_DIRS}) - set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${CMAKE_CURRENT_BINARY_DIR} -fPIC -D_GNU_SOURCE") + set (IDIRS "${CMAKE_CURRENT_BINARY_DIR}") + set (CDEFS "_GNU_SOURCE;HAVE_MEMFD_CREATE;HAVE_MKOSTEMP;HAVE_POSIX_FALLOCATE") + set (COPTS "-fPIC") if (DBUS_FOUND) - set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DHAS_DBUS") + set (CDEFS "${CDEFS};HAS_DBUS") + set (IDIRS "${IDIRS};${DBUS_INCLUDE_DIRS}") endif (DBUS_FOUND) if (OPTION_USE_SYSTEM_LIBDECOR) - set (CDEFS "USE_SYSTEM_LIBDECOR;LIBDECOR_PLUGIN_DIR=${LIBDECOR_PLUGIN_DIR}") + set (CDEFS "${CDEFS};USE_SYSTEM_LIBDECOR;LIBDECOR_PLUGIN_DIR=${LIBDECOR_PLUGIN_DIR}") if (GTK_FOUND) set (CDEFS "${CDEFS};HAVE_GTK") endif (GTK_FOUND) set_source_files_properties( ${CMAKE_CURRENT_SOURCE_DIR}/../libdecor/build/fl_libdecor-plugins.c - PROPERTIES COMPILE_DEFINITIONS "${CDEFS}") + ${CMAKE_CURRENT_SOURCE_DIR}/../libdecor/src/os-compatibility.c + ${CMAKE_CURRENT_SOURCE_DIR}/../libdecor/src/cursor-settings.c + PROPERTIES COMPILE_DEFINITIONS "${CDEFS}" + INCLUDE_DIRECTORIES "${IDIRS}" + COMPILE_OPTIONS "${COPTS}" + ) else() - set (IDEFS "${CMAKE_CURRENT_SOURCE_DIR}/../libdecor/src" + set (IDIRS "${IDIRS};${CMAKE_CURRENT_SOURCE_DIR}/../libdecor/src" "${CMAKE_CURRENT_SOURCE_DIR}/../libdecor/src/plugins") - set (CDEFS - "USE_SYSTEM_LIBDECOR=0;LIBDECOR_PLUGIN_API_VERSION=1" - "HAVE_MEMFD_CREATE;HAVE_MKOSTEMP;HAVE_POSIX_FALLOCATE" - "LIBDECOR_PLUGIN_DIR=\"\"" - ) + set (CDEFS "${CDEFS};USE_SYSTEM_LIBDECOR=0;LIBDECOR_PLUGIN_API_VERSION=1" + "LIBDECOR_PLUGIN_DIR=\"\"") if (GTK_FOUND AND OPTION_ALLOW_GTK_PLUGIN) set (CDEFS "${CDEFS};HAVE_GTK") endif (GTK_FOUND AND OPTION_ALLOW_GTK_PLUGIN) @@ -542,7 +546,12 @@ if (OPTION_USE_WAYLAND) ${CMAKE_CURRENT_SOURCE_DIR}/../libdecor/build/fl_libdecor.c ${CMAKE_CURRENT_SOURCE_DIR}/../libdecor/build/fl_libdecor-plugins.c ${CMAKE_CURRENT_SOURCE_DIR}/../libdecor/src/os-compatibility.c - PROPERTIES COMPILE_DEFINITIONS "${CDEFS}" INCLUDE_DIRECTORIES "${IDEFS}") + ${CMAKE_CURRENT_SOURCE_DIR}/../libdecor/src/cursor-settings.c + PROPERTIES + COMPILE_DEFINITIONS "${CDEFS}" + INCLUDE_DIRECTORIES "${IDIRS}" + COMPILE_OPTIONS "${COPTS}" + ) endif (OPTION_USE_SYSTEM_LIBDECOR) list (APPEND CFILES |