|
|
commit ad96df9e93086d49826bce8eebe643d7db25aa3f
Author: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
AuthorDate: Sat May 21 07:55:03 2022 +0200
Commit: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
CommitDate: Sat May 21 07:55:03 2022 +0200
Wayland under FreeBSD: detect <GL/glu.h> and fix LIBDECOR_PLUGIN_DIR.
CMake/resources.cmake | 4 ++++
src/CMakeLists.txt | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git CMake/resources.cmake CMake/resources.cmake
index b381567..aa17f73 100644
--- CMake/resources.cmake
+++ CMake/resources.cmake
@@ -49,6 +49,10 @@ include (FindPkgConfig)
# Find header files...
#######################################################################
+if (${CMAKE_HOST_SYSTEM_NAME} STREQUAL "FreeBSD")
+ list (APPEND CMAKE_REQUIRED_INCLUDES /usr/local/include)
+endif (${CMAKE_HOST_SYSTEM_NAME} STREQUAL "FreeBSD")
+
fl_find_header (HAVE_ALSA_ASOUNDLIB_H alsa/asoundlib.h)
fl_find_header (HAVE_DLFCN_H dlfcn.h)
fl_find_header (HAVE_GL_GLU_H GL/glu.h)
diff --git src/CMakeLists.txt src/CMakeLists.txt
index 19f6593..c0c71a6 100644
--- src/CMakeLists.txt
+++ src/CMakeLists.txt
@@ -467,7 +467,7 @@ if (OPTION_USE_WAYLAND)
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DLIBDECOR_PLUGIN_DIR=${LIBDECOR_PLUGIN_DIR} ")
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_SYSTEM_LIBDECOR")
else()
- set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${CMAKE_CURRENT_SOURCE_DIR}/../libdecor/src -DLIBDECOR_PLUGIN_API_VERSION=1 -DLIBDECOR_PLUGIN_DIR=\\\"/usr/local/lib\\\" ")
+ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${CMAKE_CURRENT_SOURCE_DIR}/../libdecor/src -DLIBDECOR_PLUGIN_API_VERSION=1 -DLIBDECOR_PLUGIN_DIR=\\\"/usr/local/lib/libdecor/plugins-1\\\" ")
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DUSE_SYSTEM_LIBDECOR=0 -DHAVE_MEMFD_CREATE -DHAVE_MKOSTEMP -DHAVE_POSIX_FALLOCATE")
endif (OPTION_USE_SYSTEM_LIBDECOR)
[ Direct Link to Message ] | |
|
| |