From 3e44efc8417b67661e29a6618380cd643d619d9c Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Wed, 31 May 2023 08:29:24 +0200 Subject: [PATCH] [cmake] use FindX11 from CMake 3.13 --- CMakeLists.txt | 10 -- channels/tsmf/client/CMakeLists.txt | 7 +- channels/tsmf/client/gstreamer/CMakeLists.txt | 14 ++- client/X11/CMakeLists.txt | 71 +++++++------- client/X11/xf_graphics.c | 2 +- cmake/FindX11.cmake | 90 ----------------- cmake/FindXKBFile.cmake | 51 ---------- cmake/FindXRandR.cmake | 49 ---------- cmake/FindXShm.cmake | 51 ---------- cmake/FindXTest.cmake | 51 ---------- cmake/FindXcursor.cmake | 51 ---------- cmake/FindXdamage.cmake | 51 ---------- cmake/FindXext.cmake | 51 ---------- cmake/FindXfixes.cmake | 51 ---------- cmake/FindXi.cmake | 61 ------------ cmake/FindXinerama.cmake | 51 ---------- cmake/FindXrender.cmake | 47 --------- cmake/FindXv.cmake | 50 ---------- libfreerdp/locale/CMakeLists.txt | 49 +++++----- rdtk/sample/CMakeLists.txt | 14 +-- server/shadow/CMakeLists.txt | 97 ++++++------------- 21 files changed, 106 insertions(+), 863 deletions(-) delete mode 100644 cmake/FindX11.cmake delete mode 100644 cmake/FindXKBFile.cmake delete mode 100644 cmake/FindXRandR.cmake delete mode 100644 cmake/FindXShm.cmake delete mode 100644 cmake/FindXTest.cmake delete mode 100644 cmake/FindXcursor.cmake delete mode 100644 cmake/FindXdamage.cmake delete mode 100644 cmake/FindXext.cmake delete mode 100644 cmake/FindXfixes.cmake delete mode 100644 cmake/FindXi.cmake delete mode 100644 cmake/FindXinerama.cmake delete mode 100644 cmake/FindXrender.cmake delete mode 100644 cmake/FindXv.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index aa9df9219..6ffe7510e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -559,10 +559,8 @@ else() endif() if(UNIX OR CYGWIN) - set(X11_FEATURE_TYPE "RECOMMENDED") set(WAYLAND_FEATURE_TYPE "RECOMMENDED") else() - set(X11_FEATURE_TYPE "DISABLED") set(WAYLAND_FEATURE_TYPE "DISABLED") endif() @@ -570,9 +568,6 @@ if(WITH_PCSC_WINPR) find_package(PCSCWinPR) endif() -set(X11_FEATURE_PURPOSE "X11") -set(X11_FEATURE_DESCRIPTION "X11 client and server") - set(WAYLAND_FEATURE_PURPOSE "Wayland") set(WAYLAND_FEATURE_DESCRIPTION "Wayland client") @@ -665,7 +660,6 @@ set(SOXR_FEATURE_PURPOSE "codec") set(SOXR_FEATURE_DESCRIPTION "SOX audio resample library") if(WIN32) - set(X11_FEATURE_TYPE "DISABLED") set(WAYLAND_FEATURE_TYPE "DISABLED") set(ZLIB_FEATURE_TYPE "OPTIONAL") set(OSS_FEATURE_TYPE "DISABLED") @@ -682,13 +676,11 @@ endif() if(APPLE) set(FFMPEG_FEATURE_TYPE "OPTIONAL") set(VAAPI_FEATURE_TYPE "DISABLED") - set(X11_FEATURE_TYPE "OPTIONAL") set(WAYLAND_FEATURE_TYPE "DISABLED") set(OSS_FEATURE_TYPE "DISABLED") set(ALSA_FEATURE_TYPE "DISABLED") set(SNDIO_FEATURE_TYPE "DISABLED") if(IOS) - set(X11_FEATURE_TYPE "DISABLED") set(PULSE_FEATURE_TYPE "DISABLED") set(CUPS_FEATURE_TYPE "DISABLED") set(PCSC_FEATURE_TYPE "DISABLED") @@ -712,7 +704,6 @@ if(UNIX AND NOT ANDROID) endif(UNIX AND NOT ANDROID) if(ANDROID) - set(X11_FEATURE_TYPE "DISABLED") set(WAYLAND_FEATURE_TYPE "DISABLED") set(OSS_FEATURE_TYPE "DISABLED") set(ALSA_FEATURE_TYPE "DISABLED") @@ -724,7 +715,6 @@ if(ANDROID) set(OPENSLES_FEATURE_TYPE "REQUIRED") endif() -find_feature(X11 ${X11_FEATURE_TYPE} ${X11_FEATURE_PURPOSE} ${X11_FEATURE_DESCRIPTION}) find_feature(Wayland ${WAYLAND_FEATURE_TYPE} ${WAYLAND_FEATURE_PURPOSE} ${WAYLAND_FEATURE_DESCRIPTION}) find_feature(ZLIB ${ZLIB_FEATURE_TYPE} ${ZLIB_FEATURE_PURPOSE} ${ZLIB_FEATURE_DESCRIPTION}) diff --git a/channels/tsmf/client/CMakeLists.txt b/channels/tsmf/client/CMakeLists.txt index bfc8ee904..64c011582 100644 --- a/channels/tsmf/client/CMakeLists.txt +++ b/channels/tsmf/client/CMakeLists.txt @@ -73,11 +73,8 @@ if(WITH_VIDEO_FFMPEG) endif() if(WITH_GSTREAMER_1_0) - set(XRANDR_FEATURE_TYPE "REQUIRED") - set(XRANDR_FEATURE_PURPOSE "X11 randr") - set(XRANDR_FEATURE_DESCRIPTION "X11 randr extension") - find_feature(XRandR ${XRANDR_FEATURE_TYPE} ${XRANDR_FEATURE_PURPOSE} ${XRANDR_FEATURE_DESCRIPTION}) - if (WITH_XRANDR) + find_package(X11) + if (X11_Xrandr_FOUND) add_channel_client_subsystem(${MODULE_PREFIX} ${CHANNEL_NAME} "gstreamer" "decoder") else() message(WARNING "Disabling tsmf gstreamer because XRandR wasn't found") diff --git a/channels/tsmf/client/gstreamer/CMakeLists.txt b/channels/tsmf/client/gstreamer/CMakeLists.txt index 01d73b280..f9e43e03e 100644 --- a/channels/tsmf/client/gstreamer/CMakeLists.txt +++ b/channels/tsmf/client/gstreamer/CMakeLists.txt @@ -33,20 +33,18 @@ if(ANDROID) tsmf_android.c) set(LIBS ${LIBS}) else() - set(XEXT_FEATURE_TYPE "RECOMMENDED") - set(XEXT_FEATURE_PURPOSE "X11 extension") - set(XEXT_FEATURE_DESCRIPTION "X11 core extensions") + find_package(X11 REQUIRED) - find_feature(Xext ${XEXT_FEATURE_TYPE} ${XEXT_FEATURE_PURPOSE} ${XEXT_FEATURE_DESCRIPTION}) - - set(SRC ${SRC} + list(APPENDSRC tsmf_X11.c) - set(LIBS ${LIBS} ${X11_LIBRARIES} ${XEXT_LIBRARIES}) + list(APPEND LIBS + ${X11_LIBRARIES} + ${X11_Xext_LIB}) if (NOT APPLE) list(APPEND LIBS rt) endif() - if(XEXT_FOUND) + if(X11_Xext_FOUND) add_definitions(-DWITH_XEXT=1) endif() diff --git a/client/X11/CMakeLists.txt b/client/X11/CMakeLists.txt index 4a9c0c1c0..e35fc3900 100644 --- a/client/X11/CMakeLists.txt +++ b/client/X11/CMakeLists.txt @@ -155,108 +155,107 @@ if(WITH_MANPAGES) install_freerdp_man(${CMAKE_CURRENT_BINARY_DIR}/xfreerdp.1 1) endif(WITH_MANPAGES) -find_package(XShm REQUIRED) -if(XShm_FOUND) +find_package(X11 REQUIRED) +if(X11_XShm_FOUND) add_definitions(-DWITH_XSHM) - include_directories(${XSHM_INCLUDE_DIRS}) + include_directories(${X11_XShm_INCLUDE_PATH}) list(APPEND LIBS - ${XSHM_LIBRARIES} + ${X11_Xext_LIB} ) endif() option(WITH_XINERAMA "[X11] enable xinerama" ON) if (WITH_XINERAMA) - find_package(Xinerama REQUIRED) - if(Xinerama_FOUND) + find_package(X11 REQUIRED) + if(X11_Xinerama_FOUND) add_definitions(-DWITH_XINERAMA) - include_directories(${XINERAMA_INCLUDE_DIRS}) + include_directories(${X11_Xinerama_INCLUDE_PATH}) list(APPEND LIBS - ${XINERAMA_LIBRARIES} + ${X11_Xinerama_LIB} ) endif() endif() option(WITH_XEXT "[X11] enable Xext" ON) if (WITH_XEXT) - find_package(Xext REQUIRED) - if(Xext_FOUND) + find_package(X11 REQUIRED) + if(X11_Xext_FOUND) add_definitions(-DWITH_XEXT) - include_directories(${XEXT_INCLUDE_DIRS}) list(APPEND LIBS - ${XEXT_LIBRARIES} + ${X11_Xext_LIB} ) endif() endif() option(WITH_XCURSOR "[X11] enalbe Xcursor" ON) if (WITH_XCURSOR) - find_package(Xcursor REQUIRED) - if(Xcursor_FOUND) + find_package(X11 REQUIRED) + if(X11_Xcursor_FOUND) add_definitions(-DWITH_XCURSOR) - include_directories(${XCURSOR_INCLUDE_DIRS}) + include_directories(${X11_Xcursor_INCLUDE_PATH}) list(APPEND LIBS - ${XCURSOR_LIBRARIES} + ${X11_Xcursor_LIB} ) endif() endif() option(WITH_XV "[X11] enable Xv" ON) if (WITH_XV) - find_package(Xv REQUIRED) - if(Xv_FOUND) + find_package(X11 REQUIRED) + if(X11_Xv_FOUND) add_definitions(-DWITH_XV) - include_directories(${XV_INCLUDE_DIRS}) + include_directories(${X11_Xv_INCLUDE_PATH}) list(APPEND LIBS - ${XV_LIBRARIES} + ${X11_Xv_LIB} ) endif() endif() option(WITH_XI "[X11] enalbe Xi" ON) if (WITH_XI) - find_package(Xi REQUIRED) - if(Xi_FOUND) + find_package(X11 REQUIRED) + if(X11_Xi_FOUND) add_definitions(-DWITH_XI) - include_directories(${XI_INCLUDE_DIRS}) + include_directories(${X11_Xi_INCLUDE_PATH}) list(APPEND LIBS - ${XI_LIBRARIES} + ${X11_Xi_LIB} ) endif() endif() option(WITH_XRENDER "[X11] enable XRender" ON) if(WITH_XRENDER) - find_package(Xrender REQUIRED) - if(Xrender_FOUND) + find_package(X11 REQUIRED) + if(X11_Xrender_FOUND) add_definitions(-DWITH_XRENDER) - include_directories(${XRENDER_INCLUDE_DIRS}) + include_directories(${X11_Xrender_INCLUDE_PATH}) list(APPEND LIBS - ${XRENDER_LIBRARIES} + ${X11_Xrender_LIB} ) endif() endif() option(WITH_XRANDR "[X11] enable XRandR" ON) if (WITH_XRANDR) - find_package(XRandR REQUIRED) - if(XRandR_FOUND) + find_package(X11 REQUIRED) + if(X11_Xrandr_FOUND) add_definitions(-DWITH_XRANDR) - include_directories(${XRandR_INCLUDE_DIRS}) + include_directories(${X11_Xrandr_INCLUDE_PATH}) list(APPEND LIBS - ${XRandR_LIBRARIES} + ${X11_Xrandr_LIB} ) endif() endif() option(WITH_XFIXES "[X11] enable Xfixes" ON) if (WITH_XFIXES) - find_package(Xfixes REQUIRED) - if(Xfixes_FOUND) + find_package(X11 REQUIRED) + if(X11_Xfixes_FOUND) add_definitions(-DWITH_XFIXES) - include_directories(${XFIXES_INCLUDE_DIRS}) + include_directories(${X11_Xfixes_INCLUDE_PATH}) list(APPEND LIBS - ${XFIXES_LIBRARIES} + ${X11_Xfixes_LIB} ) endif() endif() diff --git a/client/X11/xf_graphics.c b/client/X11/xf_graphics.c index 3c55faa0e..59aa38b50 100644 --- a/client/X11/xf_graphics.c +++ b/client/X11/xf_graphics.c @@ -237,7 +237,7 @@ static BOOL xf_Bitmap_SetSurface(rdpContext* context, rdpBitmap* bitmap, BOOL pr static BOOL xf_Pointer_GetCursorForCurrentScale(rdpContext* context, rdpPointer* pointer, Cursor* cursor) { -#ifdef WITH_XCURSOR +#if defined(WITH_XCURSOR) && defined(WITH_XRENDER) UINT32 CursorFormat; xfContext* xfc = (xfContext*)context; xfPointer* xpointer = (xfPointer*)pointer; diff --git a/cmake/FindX11.cmake b/cmake/FindX11.cmake deleted file mode 100644 index 47de9b780..000000000 --- a/cmake/FindX11.cmake +++ /dev/null @@ -1,90 +0,0 @@ -# - Find X11 -# Find the X11 libraries -# -# This module defines the following variables: -# X11_FOUND - true if X11_INCLUDE_DIR & X11_LIBRARY are found -# X11_LIBRARIES - Set when X11_LIBRARY is found -# X11_INCLUDE_DIRS - Set when X11_INCLUDE_DIR is found -# -# X11_INCLUDE_DIR - where to find Xlib.h, etc. -# X11_LIBRARY - the X11 library -# - -#============================================================================= -# Copyright 2011 O.S. Systems Software Ltda. -# Copyright 2011 Otavio Salvador -# Copyright 2011 Marc-Andre Moreau -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -#============================================================================= - -if (APPLE) - set(CMAKE_FIND_FRAMEWORK_OLD ${CMAKE_FIND_FRAMEWORK}) - set(CMAKE_FIND_FRAMEWORK LAST) -endif () - -find_path(X11_INCLUDE_DIR NAMES X11/Xlib.h - PATH_SUFFIXES X11 - PATHS /opt/X11/include - DOC "The X11 include directory" -) -find_path(XAUTH_INCLUDE_DIR NAMES X11/Xauth.h - PATH_SUFFIXES X11 - PATHS /opt/X11/include - DOC "The X11 include directory" -) -find_path(XCB_INCLUDE_DIR NAMES xcb/xcb.h - PATH_SUFFIXES X11 - PATHS /opt/X11/include - DOC "The X11 include directory" -) -find_path(XDMCP_INCLUDE_DIR NAMES X11/Xdmcp.h - PATH_SUFFIXES X11 - PATHS /opt/X11/include - DOC "The X11 include directory" -) - -find_library(X11_LIBRARY NAMES X11 - PATHS /opt/X11/lib - DOC "The X11 library" -) - -find_library(XCB_LIBRARY NAMES xcb - PATHS /opt/X11/lib - DOC "The X11 library" -) - -find_library(XAUTH_LIBRARY NAMES Xau - PATHS /opt/X11/lib - DOC "The X11 library" -) - -find_library(XDMCP_LIBRARY NAMES Xdmcp - PATHS /opt/X11/lib - DOC "The X11 library" -) - -if(APPLE) - set(CMAKE_FIND_FRAMEWORK ${CMAKE_FIND_FRAMEWORK_OLD}) -endif() - -include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(X11 DEFAULT_MSG X11_LIBRARY X11_INCLUDE_DIR) - -if(X11_FOUND) - set( X11_LIBRARIES ${X11_LIBRARY} ${XCB_LIBRARY} ${XAUTH_LIBRARY} ${XDMCP_LIBRARY}) - set( X11_INCLUDE_DIRS ${X11_INCLUDE_DIR} ${XCB_INCLUDE_DIR} ${XAUTH_INCLUDE_DIR} ${XDMCP_INCLUDE_DIR}) -endif() - -mark_as_advanced(X11_INCLUDE_DIR X11_LIBRARY) - diff --git a/cmake/FindXKBFile.cmake b/cmake/FindXKBFile.cmake deleted file mode 100644 index bfb6c4ca0..000000000 --- a/cmake/FindXKBFile.cmake +++ /dev/null @@ -1,51 +0,0 @@ -# - Find XKBFILE -# Find the XKBFILE libraries -# -# This module defines the following variables: -# XKBFILE_FOUND - true if XKBFILE_INCLUDE_DIR & XKBFILE_LIBRARY are found -# XKBFILE_LIBRARIES - Set when XKBFILE_LIBRARY is found -# XKBFILE_INCLUDE_DIRS - Set when XKBFILE_INCLUDE_DIR is found -# -# XKBFILE_INCLUDE_DIR - where to find XKBfile.h, etc. -# XKBFILE_LIBRARY - the xkbfile library -# - -#============================================================================= -# Copyright 2011 O.S. Systems Software Ltda. -# Copyright 2011 Otavio Salvador -# Copyright 2011 Marc-Andre Moreau -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -#============================================================================= - -find_path(XKBFILE_INCLUDE_DIR NAMES X11/extensions/XKBfile.h - PATH_SUFFIXES X11/extensions - PATHS /opt/X11/include - DOC "The XKBFile include directory" -) - -find_library(XKBFILE_LIBRARY NAMES xkbfile - PATHS /opt/X11/lib - DOC "The XKBFile library" -) - -include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(XKBFile DEFAULT_MSG XKBFILE_LIBRARY XKBFILE_INCLUDE_DIR) - -if(XKBFILE_FOUND) - set( XKBFILE_LIBRARIES ${XKBFILE_LIBRARY} ) - set( XKBFILE_INCLUDE_DIRS ${XKBFILE_INCLUDE_DIR} ) -endif() - -mark_as_advanced(XKBFILE_INCLUDE_DIR XKBFILE_LIBRARY) - diff --git a/cmake/FindXRandR.cmake b/cmake/FindXRandR.cmake deleted file mode 100644 index fb554f3b3..000000000 --- a/cmake/FindXRandR.cmake +++ /dev/null @@ -1,49 +0,0 @@ -# - Find XRandR -# Find the XRandR libraries -# -# This module defines the following variables: -# XRandR_FOUND - true if XRANDR_INCLUDE_DIR & XRANDR_LIBRARY are found -# XRandR_LIBRARIES - Set when XRANDR_LIBRARY is found -# XRandR_INCLUDE_DIRS - Set when XRANDR_INCLUDE_DIR is found -# -# XRandR_INCLUDE_DIR - where to find Xrandr.h, etc. -# XRandR_LIBRARY - the XRANDR library -# - -#============================================================================= -# Copyright 2012 Alam Arias -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -#============================================================================= - -find_path(XRandR_INCLUDE_DIR NAMES X11/extensions/Xrandr.h - PATH_SUFFIXES X11/extensions - PATHS /opt/X11/include - DOC "The XRandR include directory" -) - -find_library(XRandR_LIBRARY NAMES Xrandr - PATHS /opt/X11/lib - DOC "The XRandR library" -) - -include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(XRandR DEFAULT_MSG XRandR_LIBRARY XRandR_INCLUDE_DIR) - -if(XRandR_FOUND) - set( XRandR_LIBRARIES ${XRandR_LIBRARY} ) - set( XRandR_INCLUDE_DIRS ${XRandR_INCLUDE_DIR} ) -endif() - -mark_as_advanced(XRandR_INCLUDE_DIR XRandR_LIBRARY) - diff --git a/cmake/FindXShm.cmake b/cmake/FindXShm.cmake deleted file mode 100644 index 7b0796ebd..000000000 --- a/cmake/FindXShm.cmake +++ /dev/null @@ -1,51 +0,0 @@ -# - Find XSHM -# Find the XSHM libraries -# -# This module defines the following variables: -# XSHM_FOUND - true if XSHM_INCLUDE_DIR & XSHM_LIBRARY are found -# XSHM_LIBRARIES - Set when XSHM_LIBRARY is found -# XSHM_INCLUDE_DIRS - Set when XSHM_INCLUDE_DIR is found -# -# XSHM_INCLUDE_DIR - where to find XShm.h, etc. -# XSHM_LIBRARY - the XSHM library -# - -#============================================================================= -# Copyright 2011 O.S. Systems Software Ltda. -# Copyright 2011 Otavio Salvador -# Copyright 2011 Marc-Andre Moreau -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -#============================================================================= - -find_path(XSHM_INCLUDE_DIR NAMES X11/extensions/XShm.h - PATH_SUFFIXES X11/extensions - PATHS /opt/X11/include - DOC "The XShm include directory" -) - -find_library(XSHM_LIBRARY NAMES Xext - PATHS /opt/X11/lib - DOC "The XShm library" -) - -include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(XShm DEFAULT_MSG XSHM_LIBRARY XSHM_INCLUDE_DIR) - -if(XSHM_FOUND) - set( XSHM_LIBRARIES ${XSHM_LIBRARY} ) - set( XSHM_INCLUDE_DIRS ${XSHM_INCLUDE_DIR} ) -endif() - -mark_as_advanced(XSHM_INCLUDE_DIR XSHM_LIBRARY) - diff --git a/cmake/FindXTest.cmake b/cmake/FindXTest.cmake deleted file mode 100644 index 8fb21f682..000000000 --- a/cmake/FindXTest.cmake +++ /dev/null @@ -1,51 +0,0 @@ -# - Find XTEST -# Find the XTEST libraries -# -# This module defines the following variables: -# XTEST_FOUND - true if XTEST_INCLUDE_DIR & XTEST_LIBRARY are found -# XTEST_LIBRARIES - Set when XTEST_LIBRARY is found -# XTEST_INCLUDE_DIRS - Set when XTEST_INCLUDE_DIR is found -# -# XTEST_INCLUDE_DIR - where to find XTest.h, etc. -# XTEST_LIBRARY - the XTEST library -# - -#============================================================================= -# Copyright 2011 O.S. Systems Software Ltda. -# Copyright 2011 Otavio Salvador -# Copyright 2011 Marc-Andre Moreau -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -#============================================================================= - -find_path(XTEST_INCLUDE_DIR NAMES X11/extensions/XTest.h - PATH_SUFFIXES X11/extensions - PATHS /opt/X11/include - DOC "The XTest include directory" -) - -find_library(XTEST_LIBRARY NAMES Xtst - PATHS /opt/X11/lib - DOC "The XTest library" -) - -include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(XTest DEFAULT_MSG XTEST_LIBRARY XTEST_INCLUDE_DIR) - -if(XTEST_FOUND) - set( XTEST_LIBRARIES ${XTEST_LIBRARY} ) - set( XTEST_INCLUDE_DIRS ${XTEST_INCLUDE_DIR} ) -endif() - -mark_as_advanced(XTEST_INCLUDE_DIR XTEST_LIBRARY) - diff --git a/cmake/FindXcursor.cmake b/cmake/FindXcursor.cmake deleted file mode 100644 index a333ecd4e..000000000 --- a/cmake/FindXcursor.cmake +++ /dev/null @@ -1,51 +0,0 @@ -# - Find Xcursor -# Find the Xcursor libraries -# -# This module defines the following variables: -# XCURSOR_FOUND - true if XCURSOR_INCLUDE_DIR & XCURSOR_LIBRARY are found -# XCURSOR_LIBRARIES - Set when XCURSOR_LIBRARY is found -# XCURSOR_INCLUDE_DIRS - Set when XCURSOR_INCLUDE_DIR is found -# -# XCURSOR_INCLUDE_DIR - where to find Xcursor.h, etc. -# XCURSOR_LIBRARY - the Xcursor library -# - -#============================================================================= -# Copyright 2011 O.S. Systems Software Ltda. -# Copyright 2011 Otavio Salvador -# Copyright 2011 Marc-Andre Moreau -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -#============================================================================= - -find_path(XCURSOR_INCLUDE_DIR NAMES X11/Xcursor/Xcursor.h - PATH_SUFFIXES X11/Xcursor - PATHS /opt/X11/include - DOC "The Xcursor include directory" -) - -find_library(XCURSOR_LIBRARY NAMES Xcursor - PATHS /opt/X11/lib - DOC "The Xcursor library" -) - -include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Xcursor DEFAULT_MSG XCURSOR_LIBRARY XCURSOR_INCLUDE_DIR) - -if(XCURSOR_FOUND) - set( XCURSOR_LIBRARIES ${XCURSOR_LIBRARY} ) - set( XCURSOR_INCLUDE_DIRS ${XCURSOR_INCLUDE_DIR} ) -endif() - -mark_as_advanced(XCURSOR_INCLUDE_DIR XCURSOR_LIBRARY) - diff --git a/cmake/FindXdamage.cmake b/cmake/FindXdamage.cmake deleted file mode 100644 index 16f8f6473..000000000 --- a/cmake/FindXdamage.cmake +++ /dev/null @@ -1,51 +0,0 @@ -# - Find XDAMAGE -# Find the XDAMAGE libraries -# -# This module defines the following variables: -# XDAMAGE_FOUND - true if XDAMAGE_INCLUDE_DIR & XDAMAGE_LIBRARY are found -# XDAMAGE_LIBRARIES - Set when XDAMAGE_LIBRARY is found -# XDAMAGE_INCLUDE_DIRS - Set when XDAMAGE_INCLUDE_DIR is found -# -# XDAMAGE_INCLUDE_DIR - where to find Xdamage.h, etc. -# XDAMAGE_LIBRARY - the XDAMAGE library -# - -#============================================================================= -# Copyright 2011 O.S. Systems Software Ltda. -# Copyright 2011 Otavio Salvador -# Copyright 2011 Marc-Andre Moreau -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -#============================================================================= - -find_path(XDAMAGE_INCLUDE_DIR NAMES X11/extensions/Xdamage.h - PATH_SUFFIXES X11/extensions - PATHS /opt/X11/include - DOC "The Xdamage include directory" -) - -find_library(XDAMAGE_LIBRARY NAMES Xdamage - PATHS /opt/X11/lib - DOC "The Xdamage library" -) - -include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Xdamage DEFAULT_MSG XDAMAGE_LIBRARY XDAMAGE_INCLUDE_DIR) - -if(XDAMAGE_FOUND) - set( XDAMAGE_LIBRARIES ${XDAMAGE_LIBRARY} ) - set( XDAMAGE_INCLUDE_DIRS ${XDAMAGE_INCLUDE_DIR} ) -endif() - - -mark_as_advanced(XDAMAGE_INCLUDE_DIR XDAMAGE_LIBRARY) diff --git a/cmake/FindXext.cmake b/cmake/FindXext.cmake deleted file mode 100644 index bb054003f..000000000 --- a/cmake/FindXext.cmake +++ /dev/null @@ -1,51 +0,0 @@ -# - Find Xext -# Find the Xext libraries -# -# This module defines the following variables: -# Xext_FOUND - true if Xext_INCLUDE_DIR & Xext_LIBRARY are found -# Xext_LIBRARIES - Set when Xext_LIBRARY is found -# Xext_INCLUDE_DIRS - Set when Xext_INCLUDE_DIR is found -# -# Xext_INCLUDE_DIR - where to find Xext.h, etc. -# Xext_LIBRARY - the Xext library -# - -#============================================================================= -# Copyright 2011 O.S. Systems Software Ltda. -# Copyright 2011 Otavio Salvador -# Copyright 2011 Marc-Andre Moreau -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -#============================================================================= - -find_path(XEXT_INCLUDE_DIR NAMES X11/extensions/Xext.h - PATH_SUFFIXES X11/extensions - PATHS /opt/X11/include - DOC "The Xext include directory" -) - -find_library(XEXT_LIBRARY NAMES Xext - PATHS /opt/X11/lib - DOC "The Xext library" -) - -include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Xext DEFAULT_MSG XEXT_LIBRARY XEXT_INCLUDE_DIR) - -if(XEXT_FOUND) - set( XEXT_LIBRARIES ${XEXT_LIBRARY} ) - set( XEXT_INCLUDE_DIRS ${XEXT_INCLUDE_DIR} ) -endif() - -mark_as_advanced(XEXT_INCLUDE_DIR XEXT_LIBRARY) - diff --git a/cmake/FindXfixes.cmake b/cmake/FindXfixes.cmake deleted file mode 100644 index ca3e5119b..000000000 --- a/cmake/FindXfixes.cmake +++ /dev/null @@ -1,51 +0,0 @@ -# - Find XFIXES -# Find the XFIXES libraries -# -# This module defines the following variables: -# XFIXES_FOUND - true if XFIXES_INCLUDE_DIR & XFIXES_LIBRARY are found -# XFIXES_LIBRARIES - Set when XFIXES_LIBRARY is found -# XFIXES_INCLUDE_DIRS - Set when XFIXES_INCLUDE_DIR is found -# -# XFIXES_INCLUDE_DIR - where to find Xfixes.h, etc. -# XFIXES_LIBRARY - the XFIXES library -# - -#============================================================================= -# Copyright 2011 O.S. Systems Software Ltda. -# Copyright 2011 Otavio Salvador -# Copyright 2011 Marc-Andre Moreau -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -#============================================================================= - -find_path(XFIXES_INCLUDE_DIR NAMES X11/extensions/Xfixes.h - PATH_SUFFIXES X11/extensions - PATHS /opt/X11/include - DOC "The Xfixes include directory" -) - -find_library(XFIXES_LIBRARY NAMES Xfixes - PATHS /opt/X11/lib - DOC "The Xfixes library" -) - -include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Xfixes DEFAULT_MSG XFIXES_LIBRARY XFIXES_INCLUDE_DIR) - -if(XFIXES_FOUND) - set( XFIXES_LIBRARIES ${XFIXES_LIBRARY} ) - set( XFIXES_INCLUDE_DIRS ${XFIXES_INCLUDE_DIR} ) -endif() - -mark_as_advanced(XFIXES_INCLUDE_DIR XFIXES_LIBRARY) - diff --git a/cmake/FindXi.cmake b/cmake/FindXi.cmake deleted file mode 100644 index 1224bdb76..000000000 --- a/cmake/FindXi.cmake +++ /dev/null @@ -1,61 +0,0 @@ -# - Find Xi -# Find the Xi libraries -# -# This module defines the following variables: -# XI_FOUND - true if XI_INCLUDE_DIR & XI_LIBRARY are found -# XI_LIBRARIES - Set when XI_LIBRARY is found -# XI_INCLUDE_DIRS - Set when XI_INCLUDE_DIR is found -# -# XI_INCLUDE_DIR - where to find XInput2.h, etc. -# XI_LIBRARY - the Xi library -# - -#============================================================================= -# Copyright 2011 O.S. Systems Software Ltda. -# Copyright 2011 Otavio Salvador -# Copyright 2011 Marc-Andre Moreau -# Copyright 2013 Corey Clayton -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -#============================================================================= - -find_package(PkgConfig) - -if(PKG_CONFIG_FOUND) - pkg_check_modules(_XI xi) -endif (PKG_CONFIG_FOUND) - -include(CheckSymbolExists) - -find_path(XI_INCLUDE_DIR NAMES X11/extensions/XInput2.h - PATHS /opt/X11/include - ${_XI_INCLUDEDIR} - ${_XI_INCLUDE_DIRS} - DOC "The Xi include directory") - -find_library(XI_LIBRARY NAMES Xi - PATHS /opt/X11/lib - ${_XI_LIBDIR} - ${_XI_LIBRARY_DIRS} - DOC "The Xi library") - -include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Xi DEFAULT_MSG XI_LIBRARY XI_INCLUDE_DIR) - -if(XI_FOUND) - set(XI_LIBRARIES ${XI_LIBRARY}) - set(XI_INCLUDE_DIRS ${XI_INCLUDE_DIR}) -endif() - -mark_as_advanced(XI_INCLUDE_DIR XI_LIBRARY) - diff --git a/cmake/FindXinerama.cmake b/cmake/FindXinerama.cmake deleted file mode 100644 index 8863d8c7b..000000000 --- a/cmake/FindXinerama.cmake +++ /dev/null @@ -1,51 +0,0 @@ -# - Find XINERAMA -# Find the XINERAMA libraries -# -# This module defines the following variables: -# XINERAMA_FOUND - true if XINERAMA_INCLUDE_DIR & XINERAMA_LIBRARY are found -# XINERAMA_LIBRARIES - Set when XINERAMA_LIBRARY is found -# XINERAMA_INCLUDE_DIRS - Set when XINERAMA_INCLUDE_DIR is found -# -# XINERAMA_INCLUDE_DIR - where to find Xinerama.h, etc. -# XINERAMA_LIBRARY - the XINERAMA library -# - -#============================================================================= -# Copyright 2011 O.S. Systems Software Ltda. -# Copyright 2011 Otavio Salvador -# Copyright 2011 Marc-Andre Moreau -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -#============================================================================= - -find_path(XINERAMA_INCLUDE_DIR NAMES X11/extensions/Xinerama.h - PATHS /opt/X11/include - PATH_SUFFIXES X11/extensions - DOC "The Xinerama include directory" -) - -find_library(XINERAMA_LIBRARY NAMES Xinerama - PATHS /opt/X11/lib - DOC "The Xinerama library" -) - -include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Xinerama DEFAULT_MSG XINERAMA_LIBRARY XINERAMA_INCLUDE_DIR) - -if(XINERAMA_FOUND) - set( XINERAMA_LIBRARIES ${XINERAMA_LIBRARY} ) - set( XINERAMA_INCLUDE_DIRS ${XINERAMA_INCLUDE_DIR} ) -endif() - -mark_as_advanced(XINERAMA_INCLUDE_DIR XINERAMA_LIBRARY) - diff --git a/cmake/FindXrender.cmake b/cmake/FindXrender.cmake deleted file mode 100644 index 8fb45af00..000000000 --- a/cmake/FindXrender.cmake +++ /dev/null @@ -1,47 +0,0 @@ -# - Find XRender -# Find the XRender libraries -# -# This module defines the following variables: -# XRENDER_FOUND - true if XRENDER_INCLUDE_DIR & XRENDER_LIBRARY are found -# XRENDER_LIBRARIES - Set when Xrender_LIBRARY is found -# XRENDER_INCLUDE_DIRS - Set when Xrender_INCLUDE_DIR is found -# -# XRENDER_INCLUDE_DIR - where to find Xrender.h, etc. -# XRENDER_LIBRARY - the Xrender library -# - -#============================================================================= -# Copyright 2013 Corey Clayton -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -#============================================================================= - -find_path(XRENDER_INCLUDE_DIR NAMES X11/extensions/Xrender.h - PATHS /opt/X11/include - DOC "The Xrender include directory") - -find_library(XRENDER_LIBRARY NAMES Xrender - PATHS /opt/X11/lib - DOC "The Xrender library") - -include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Xrender DEFAULT_MSG XRENDER_LIBRARY XRENDER_INCLUDE_DIR) - -if(XRENDER_FOUND) - - set(XRENDER_LIBRARIES ${XRENDER_LIBRARY}) - set(XRENDER_INCLUDE_DIRS ${XRENDER_INCLUDE_DIR}) - -endif() - -mark_as_advanced(XRENDER_INCLUDE_DIR XRENDER_LIBRARY) diff --git a/cmake/FindXv.cmake b/cmake/FindXv.cmake deleted file mode 100644 index ded749698..000000000 --- a/cmake/FindXv.cmake +++ /dev/null @@ -1,50 +0,0 @@ -# - Find Xv -# Find the Xv libraries -# -# This module defines the following variables: -# XV_FOUND - true if XV_INCLUDE_DIR & XV_LIBRARY are found -# XV_LIBRARIES - Set when XV_LIBRARY is found -# XV_INCLUDE_DIRS - Set when XV_INCLUDE_DIR is found -# -# XV_INCLUDE_DIR - where to find Xv.h, etc. -# XV_LIBRARY - the Xv library -# - -#============================================================================= -# Copyright 2011 O.S. Systems Software Ltda. -# Copyright 2011 Otavio Salvador -# Copyright 2011 Marc-Andre Moreau -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -#============================================================================= - -find_path(XV_INCLUDE_DIR NAMES X11/extensions/Xv.h - PATHS /opt/X11/include - DOC "The Xv include directory" -) - -find_library(XV_LIBRARY NAMES Xv - PATHS /opt/X11/lib - DOC "The Xv library" -) - -include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Xv DEFAULT_MSG XV_LIBRARY XV_INCLUDE_DIR) - -if(XV_FOUND) - set( XV_LIBRARIES ${XV_LIBRARY} ) - set( XV_INCLUDE_DIRS ${XV_INCLUDE_DIR} ) -endif() - -mark_as_advanced(XV_INCLUDE_DIR XV_LIBRARY) - diff --git a/libfreerdp/locale/CMakeLists.txt b/libfreerdp/locale/CMakeLists.txt index 5b0d2edd0..c190b9f60 100644 --- a/libfreerdp/locale/CMakeLists.txt +++ b/libfreerdp/locale/CMakeLists.txt @@ -18,27 +18,27 @@ set(MODULE_NAME "freerdp-locale") set(MODULE_PREFIX "FREERDP_LOCALE") -set(${MODULE_PREFIX}_SRCS +set(SRCS keyboard_layout.c keyboard.c locale.c liblocale.h) -set(${MODULE_PREFIX}_X11_SRCS +set(X11_SRCS keyboard_x11.c keyboard_x11.h xkb_layout_ids.c xkb_layout_ids.h) -set(${MODULE_PREFIX}_XKBFILE_SRCS +set(XKBFILE_SRCS keyboard_xkbfile.c keyboard_xkbfile.h) -set(${MODULE_PREFIX}_SUN_SRCS +set(SUN_SRCS keyboard_sun.c keyboard_sun.h) -set(${MODULE_PREFIX}_APPLE_SRCS +set(APPLE_SRCS keyboard_apple.c keyboard_apple.h) @@ -47,40 +47,43 @@ if(CMAKE_SYSTEM_NAME MATCHES Solaris) endif() if(APPLE AND (NOT IOS)) - set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} ${${MODULE_PREFIX}_APPLE_SRCS}) + list(APPEND SRCS + ${APPLE_SRCS}) find_library(CARBON Carbon) freerdp_library_add(${CARBON}) endif() if (APPLE) - FIND_LIBRARY(รง CoreFoundation REQUIRED) - freerdp_library_add(${CORE_FOUNDATION}) + FIND_LIBRARY(CORE_FOUNDATION CoreFoundation REQUIRED) + freerdp_library_add(${CORE_FOUNDATION}) endif() if(WITH_X11) + find_package(X11 REQUIRED) + freerdp_definition_add(-DWITH_X11) - freerdp_include_directory_add(${X11_INCLUDE_DIRS}) - set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} ${${MODULE_PREFIX}_X11_SRCS}) + freerdp_include_directory_add(${X11_INCLUDE_DIR}) + list( APPEND SRCS + ${X11_SRCS}) freerdp_library_add(${X11_LIBRARIES}) if(WITH_SUN) freerdp_definition_add(-DWITH_SUN) - set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} ${${MODULE_PREFIX}_SUN_SRCS}) + list(APPEND SRCS + ${SUN_SRCS}) endif() - set(XKBFILE_FEATURE_TYPE "RECOMMENDED") - set(XKBFILE_FEATURE_PURPOSE "X11 keyboard") - set(XKBFILE_FEATURE_DESCRIPTION "X11 keyboard file extension") - - find_feature(XKBFile ${XKBFILE_FEATURE_TYPE} ${XKBFILE_FEATURE_PURPOSE} ${XKBFILE_FEATURE_DESCRIPTION}) - - if(WITH_XKBFILE AND (NOT APPLE)) + if( X11_Xkbfile_FOUND AND (NOT APPLE)) freerdp_definition_add(-DWITH_XKBFILE) - freerdp_include_directory_add(${XKBFILE_INCLUDE_DIRS}) - set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} ${${MODULE_PREFIX}_XKBFILE_SRCS}) - freerdp_library_add(${XKBFILE_LIBRARIES}) + freerdp_include_directory_add(${X11_Xkbfile_INCLUDE_PATH}) + list(APPEND SRCS + ${XKBFILE_SRCS} + ) + freerdp_library_add(${X11_Xkbfile_LIB}) else() - set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} ${${MODULE_PREFIX}_X11_KEYMAP_SRCS}) + list(APPEND SRCS + ${X11_KEYMAP_SRCS} + ) endif() endif() @@ -88,4 +91,4 @@ if(WITH_WAYLAND) freerdp_definition_add(-DWITH_WAYLAND) endif() -freerdp_module_add(${${MODULE_PREFIX}_SRCS}) +freerdp_module_add(${SRCS}) diff --git a/rdtk/sample/CMakeLists.txt b/rdtk/sample/CMakeLists.txt index 3a7f4ffcc..d97e17cb9 100644 --- a/rdtk/sample/CMakeLists.txt +++ b/rdtk/sample/CMakeLists.txt @@ -18,18 +18,20 @@ set(MODULE_NAME "rdtk-sample") set(MODULE_PREFIX "RDTK_SAMPLE") -include_directories(${X11_INCLUDE_DIRS}) +find_package(X11 REQUIRED) -set(${MODULE_PREFIX}_SRCS +include_directories(${X11_INCLUDE_DIR}) + +set(SRCS rdtk_x11.c) -add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS}) +add_executable(${MODULE_NAME} ${SRCS}) -set(${MODULE_PREFIX}_LIBS rdtk) +set(LIBS rdtk) -list(APPEND ${MODULE_PREFIX}_LIBS ${X11_LIBRARIES}) +list(APPEND LIBS ${X11_LIBRARIES}) -target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS} winpr) +target_link_libraries(${MODULE_NAME} PRIVATE ${LIBS} winpr) set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "RdTk") diff --git a/server/shadow/CMakeLists.txt b/server/shadow/CMakeLists.txt index c62a4eae6..108192c29 100644 --- a/server/shadow/CMakeLists.txt +++ b/server/shadow/CMakeLists.txt @@ -156,100 +156,59 @@ if(WITH_SHADOW_X11 OR WITH_SHADOW_MAC) endif() if(WITH_SHADOW_X11) - set(XEXT_FEATURE_TYPE "RECOMMENDED") - set(XEXT_FEATURE_PURPOSE "X11 extension") - set(XEXT_FEATURE_DESCRIPTION "X11 core extensions") - - set(XSHM_FEATURE_TYPE "RECOMMENDED") - set(XSHM_FEATURE_PURPOSE "X11 shared memory") - set(XSHM_FEATURE_DESCRIPTION "X11 shared memory extension") - - set(XINERAMA_FEATURE_TYPE "RECOMMENDED") - set(XINERAMA_FEATURE_PURPOSE "multi-monitor") - set(XINERAMA_FEATURE_DESCRIPTION "X11 multi-monitor extension") - - set(XTEST_FEATURE_TYPE "RECOMMENDED") - set(XTEST_FEATURE_PURPOSE "X11 input event injection") - set(XTEST_FEATURE_DESCRIPTION "X11 input event injection extension") - - set(XCURSOR_FEATURE_TYPE "RECOMMENDED") - set(XCURSOR_FEATURE_PURPOSE "cursor") - set(XCURSOR_FEATURE_DESCRIPTION "X11 cursor extension") - - set(XFIXES_FEATURE_TYPE "RECOMMENDED") - set(XFIXES_FEATURE_PURPOSE "X11 region") - set(XFIXES_FEATURE_DESCRIPTION "X11 region fix extension") - - set(XRANDR_FEATURE_TYPE "RECOMMENDED") - set(XRANDR_FEATURE_PURPOSE "X11 resize, rotate and reflect") - set(XRANDR_FEATURE_DESCRIPTION "X11 resize, rotate and reflect extension") - - set(XDAMAGE_FEATURE_TYPE "RECOMMENDED") - set(XDAMAGE_FEATURE_PURPOSE "X11 region damage") - set(XDAMAGE_FEATURE_DESCRIPTION "X11 region damage extension") - - find_feature(Xext ${XEXT_FEATURE_TYPE} ${XEXT_FEATURE_PURPOSE} ${XEXT_FEATURE_DESCRIPTION}) - find_feature(XShm ${XSHM_FEATURE_TYPE} ${XSHM_FEATURE_PURPOSE} ${XSHM_FEATURE_DESCRIPTION}) - find_feature(XTest ${XTEST_FEATURE_TYPE} ${XTEST_FEATURE_PURPOSE} ${XTEST_FEATURE_DESCRIPTION}) - find_feature(Xfixes ${XFIXES_FEATURE_TYPE} ${XFIXES_FEATURE_PURPOSE} ${XFIXES_FEATURE_DESCRIPTION}) - find_feature(Xdamage ${XDAMAGE_FEATURE_TYPE} ${XDAMAGE_FEATURE_PURPOSE} ${XDAMAGE_FEATURE_DESCRIPTION}) - find_feature(Xinerama ${XINERAMA_FEATURE_TYPE} ${XINERAMA_FEATURE_PURPOSE} ${XINERAMA_FEATURE_DESCRIPTION}) - find_feature(XRandR ${XRANDR_FEATURE_TYPE} ${XRANDR_FEATURE_PURPOSE} ${XRANDR_FEATURE_DESCRIPTION}) - find_feature(Xcursor ${XCURSOR_FEATURE_TYPE} ${XCURSOR_FEATURE_PURPOSE} ${XCURSOR_FEATURE_DESCRIPTION}) - - if(WITH_X11) + find_package(X11 REQUIRED) + if(X11_FOUND) add_definitions(-DWITH_X11) - include_directories(${X11_INCLUDE_DIRS}) + include_directories(${X11_INCLUDE_DIR}) list(APPEND ${MODULE_PREFIX}_X11_LIBS ${X11_LIBRARIES}) endif() - if(WITH_XSHM) + if(X11_XShm_FOUND) add_definitions(-DWITH_XSHM) - include_directories(${XSHM_INCLUDE_DIRS}) - list(APPEND ${MODULE_PREFIX}_X11_LIBS ${XSHM_LIBRARIES}) + include_directories(${X11_XShm_INCLUDE_PATH}) + list(APPEND ${MODULE_PREFIX}_X11_LIBS ${X11_Xext_LIB}) endif() - if(WITH_XEXT) + if(X11_Xext_FOUND) add_definitions(-DWITH_XEXT) - include_directories(${XEXT_INCLUDE_DIRS}) - list(APPEND ${MODULE_PREFIX}_X11_LIBS ${XEXT_LIBRARIES}) + list(APPEND ${MODULE_PREFIX}_X11_LIBS ${X11_Xext_LIB}) endif() - if(WITH_XINERAMA) + if(X11_Xinerama_FOUND) add_definitions(-DWITH_XINERAMA) - include_directories(${XINERAMA_INCLUDE_DIRS}) - list(APPEND ${MODULE_PREFIX}_X11_LIBS ${XINERAMA_LIBRARIES}) + include_directories(${X11_Xinerama_INCLUDE_PATH}) + list(APPEND ${MODULE_PREFIX}_X11_LIBS ${X11_Xinerama_LIB}) endif() - if(WITH_XDAMAGE) + if(X11_Xdamage_FOUND) add_definitions(-DWITH_XDAMAGE) - include_directories(${XDAMAGE_INCLUDE_DIRS}) - list(APPEND ${MODULE_PREFIX}_X11_LIBS ${XDAMAGE_LIBRARIES}) + include_directories(${X11_Xdamage_INCLUDE_PATH}) + list(APPEND ${MODULE_PREFIX}_X11_LIBS ${X11_Xdamage_LIB}) endif() - if(WITH_XFIXES) + if(X11_Xfixes_FOUND) add_definitions(-DWITH_XFIXES) - include_directories(${XFIXES_INCLUDE_DIRS}) - list(APPEND ${MODULE_PREFIX}_X11_LIBS ${XFIXES_LIBRARIES}) + include_directories(${X11_Xfixes_INCLUDE_PATH}) + list(APPEND ${MODULE_PREFIX}_X11_LIBS ${X11_Xfixes_LIB}) endif() - if(WITH_XTEST) + if(X11_XTest_FOUND) add_definitions(-DWITH_XTEST) - include_directories(${XTEST_INCLUDE_DIRS}) - list(APPEND ${MODULE_PREFIX}_X11_LIBS ${XTEST_LIBRARIES}) + include_directories(${X11_XTest_INCLUDE_PATH}) + list(APPEND ${MODULE_PREFIX}_X11_LIBS ${X11_XTest_LIB}) endif() # XCursor and XRandr are currently not used so don't link them - #if(WITH_XCURSOR) + #if(X11_Xcursor_FOUND) # add_definitions(-DWITH_XCURSOR) - # include_directories(${XCURSOR_INCLUDE_DIRS}) - # list(APPEND ${MODULE_PREFIX}_X11_LIBS ${XCURSOR_LIBRARIES}) + # include_directories(${X11_Xcursor_INCLUDE_PATH}) + # list(APPEND ${MODULE_PREFIX}_X11_LIBS ${X11_Xcursor_LIB}) #endif() - #if(WITH_XRANDR) + #if(X11_Xrandr_FOUND) # add_definitions(-DWITH_XRANDR) - # include_directories(${XRANDR_INCLUDE_DIRS}) - # list(APPEND ${MODULE_PREFIX}_X11_LIBS ${XRANDR_LIBRARIES}) + # include_directories(${X11_Xrandr_INCLUDE_PATH}) + # list(APPEND ${MODULE_PREFIX}_X11_LIBS ${X11_Xrandr_LIB}) #endif() elseif(WITH_SHADOW_MAC) find_library(IOKIT IOKit) @@ -296,7 +255,7 @@ list(APPEND ${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_AUTH_LIBS}) add_library(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS}) -set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp-shadow freerdp winpr) +list(APPEND ${MODULE_PREFIX}_LIBS freerdp-shadow freerdp winpr) target_link_libraries(${MODULE_NAME} PRIVATE ${${MODULE_PREFIX}_LIBS}) @@ -344,7 +303,7 @@ endif() add_executable(${MODULE_NAME} ${${MODULE_PREFIX}_SRCS}) -set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp-shadow-subsystem freerdp-shadow freerdp winpr) +list(APPEND ${MODULE_PREFIX}_LIBS freerdp-shadow-subsystem freerdp-shadow freerdp winpr) target_link_libraries(${MODULE_NAME} PRIVATE ${${MODULE_PREFIX}_LIBS})