morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1295 from bmiklautz/mac_build_fix

Browse Source 
Mac build fix
This commit is contained in:
Bernhard Miklautz
2013-06-27 11:39:25 -07:00
parent 34c3952a01 bcef931755
commit b91f0bbb90
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@@ -318,8 +318,9 @@ if(APPLE)
set(DIRECTFB_FEATURE_TYPE "DISABLED")
set(FFMPEG_FEATURE_TYPE "OPTIONAL")
set(GSTREAMER_FEATURE_TYPE "OPTIONAL")
set(X11_FEATURE_TYPE "DISABLED")
set(X11_FEATURE_TYPE "OPTIONAL")
if(IOS)
set(X11_FEATURE_TYPE "DISABLED")
set(ALSA_FEATURE_TYPE "DISABLED")
set(PULSE_FEATURE_TYPE "DISABLED")
set(CUPS_FEATURE_TYPE "DISABLED")

12
cmake/FindXrender.cmake
View File

@@ -26,18 +26,18 @@
# limitations under the License.
#=============================================================================
find_path(Xrender_INCLUDE_DIR NAMES X11/extensions/Xrender.h
find_path(XRENDER_INCLUDE_DIR NAMES X11/extensions/Xrender.h
DOC "The Xrender include directory")
find_library(Xrender_LIBRARY NAMES Xrender
find_library(XRENDER_LIBRARY NAMES Xrender
DOC "The Xrender library")
include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Xrender DEFAULT_MSG Xrender_LIBRARY Xrender_INCLUDE_DIR)
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})
if(XRENDER_FOUND)
set(XRENDER_LIBRARIES ${XRENDER_LIBRARY})
set(XRENDER_INCLUDE_DIRS ${XRENDER_INCLUDE_DIR})
endif()
mark_as_advanced(XRENDER_INCLUDE_DIRS XRENDER_LIBRARIES)