diff --git a/CMakeLists.txt b/CMakeLists.txt index 30e1c56a2..eeb931b59 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -140,7 +140,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/freerdp.pc DESTINATION ${CMAKE_INSTALL # Build CUnit find_optional_package(CUnit) -if(CUNIT_FOUND) +if(WITH_CUNIT) enable_testing() add_subdirectory(cunit) endif() diff --git a/channels/drdynvc/audin/CMakeLists.txt b/channels/drdynvc/audin/CMakeLists.txt index a08c16f26..37fe00462 100644 --- a/channels/drdynvc/audin/CMakeLists.txt +++ b/channels/drdynvc/audin/CMakeLists.txt @@ -31,11 +31,11 @@ target_link_libraries(audin freerdp-utils) install(TARGETS audin DESTINATION ${FREERDP_PLUGIN_PATH}) -if(ALSA_FOUND) +if(WITH_ALSA) add_subdirectory(alsa) endif() -if(PULSEAUDIO_FOUND) +if(WITH_PULSEAUDIO) add_subdirectory(pulse) endif() diff --git a/channels/drdynvc/tsmf/CMakeLists.txt b/channels/drdynvc/tsmf/CMakeLists.txt index 438fc7c1d..e28cac6e7 100644 --- a/channels/drdynvc/tsmf/CMakeLists.txt +++ b/channels/drdynvc/tsmf/CMakeLists.txt @@ -43,15 +43,15 @@ target_link_libraries(tsmf freerdp-utils) install(TARGETS tsmf DESTINATION ${FREERDP_PLUGIN_PATH}) -if(FFMPEG_FOUND) +if(WITH_FFMPEG) add_subdirectory(ffmpeg) endif() -if(ALSA_FOUND) +if(WITH_ALSA) add_subdirectory(alsa) endif() -if(PULSEAUDIO_FOUND) +if(WITH_PULSEAUDIO) add_subdirectory(pulse) endif() diff --git a/channels/rdpdr/CMakeLists.txt b/channels/rdpdr/CMakeLists.txt index a05b61893..e43aeff7b 100644 --- a/channels/rdpdr/CMakeLists.txt +++ b/channels/rdpdr/CMakeLists.txt @@ -42,6 +42,6 @@ add_subdirectory(printer) add_subdirectory(parallel) add_subdirectory(serial) -if(PCSC_FOUND) +if(WITH_PCSC) add_subdirectory(smartcard) endif() diff --git a/channels/rdpdr/printer/CMakeLists.txt b/channels/rdpdr/printer/CMakeLists.txt index d70eb02e5..d0f184cf7 100644 --- a/channels/rdpdr/printer/CMakeLists.txt +++ b/channels/rdpdr/printer/CMakeLists.txt @@ -22,13 +22,14 @@ set(PRINTER_SRCS printer_main.h ) -if(CUPS_FOUND) +if(WITH_CUPS) set(PRINTER_SRCS ${PRINTER_SRCS} printer_cups.c printer_cups.h ) include_directories(${CUPS_INCLUDE_DIR}) + add_definitions(-DWITH_CUPS) endif() include_directories(..) @@ -38,7 +39,7 @@ set_target_properties(printer PROPERTIES PREFIX "") target_link_libraries(printer freerdp-utils) -if(CUPS_FOUND) +if(WITH_CUPS) target_link_libraries(printer ${CUPS_LIBRARIES}) endif() diff --git a/channels/rdpdr/printer/printer_main.c b/channels/rdpdr/printer/printer_main.c index 59cfbc548..d379102aa 100644 --- a/channels/rdpdr/printer/printer_main.c +++ b/channels/rdpdr/printer/printer_main.c @@ -30,7 +30,7 @@ #include "rdpdr_constants.h" #include "rdpdr_types.h" -#ifdef CUPS_FOUND +#ifdef WITH_CUPS #include "printer_cups.h" #endif @@ -300,7 +300,7 @@ int DeviceServiceEntry(PDEVICE_SERVICE_ENTRY_POINTS pEntryPoints) char* name; char* driver_name; -#ifdef CUPS_FOUND +#ifdef WITH_CUPS driver = printer_cups_get_driver(); #endif if (driver == NULL) diff --git a/channels/rdpsnd/CMakeLists.txt b/channels/rdpsnd/CMakeLists.txt index 79f5a36d5..3065ac63e 100644 --- a/channels/rdpsnd/CMakeLists.txt +++ b/channels/rdpsnd/CMakeLists.txt @@ -29,11 +29,11 @@ target_link_libraries(rdpsnd freerdp-utils) install(TARGETS rdpsnd DESTINATION ${FREERDP_PLUGIN_PATH}) -if(ALSA_FOUND) +if(WITH_ALSA) add_subdirectory(alsa) endif() -if(PULSEAUDIO_FOUND) +if(WITH_PULSEAUDIO) add_subdirectory(pulse) endif() diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index df58fcd1c..00949d2e8 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -25,13 +25,13 @@ if(NOT WIN32) # Build X11 Client find_suggested_package(X11) - if(X11_FOUND) + if(WITH_X11) add_subdirectory(X11) endif() # Build DirectFB Client find_optional_package(DirectFB) - if(DIRECTFB_FOUND) + if(WITH_DIRECTFB) add_subdirectory(DirectFB) endif() else() diff --git a/client/X11/CMakeLists.txt b/client/X11/CMakeLists.txt index 5f51d77be..29f9ad813 100644 --- a/client/X11/CMakeLists.txt +++ b/client/X11/CMakeLists.txt @@ -58,28 +58,28 @@ if(WITH_MANPAGES) endif(WITH_MANPAGES) find_suggested_package(Xinerama) -if(XINERAMA_FOUND) +if(WITH_XINERAMA) add_definitions(-DWITH_XINERAMA -DWITH_XEXT) include_directories(${XINERAMA_INCLUDE_DIRS}) target_link_libraries(xfreerdp ${XINERAMA_LIBRARIES}) endif() find_suggested_package(Xext) -if(XEXT_FOUND) +if(WITH_XEXT) add_definitions(-DWITH_XEXT) include_directories(${XEXT_INCLUDE_DIRS}) target_link_libraries(xfreerdp ${XEXT_LIBRARIES}) endif() find_suggested_package(Xcursor) -if(XCURSOR_FOUND) +if(WITH_XCURSOR) add_definitions(-DWITH_XCURSOR) include_directories(${XCURSOR_INCLUDE_DIRS}) target_link_libraries(xfreerdp ${XCURSOR_LIBRARIES}) endif() find_suggested_package(Xv) -if(XV_FOUND) +if(WITH_XV) add_definitions(-DWITH_XV) include_directories(${XV_INCLUDE_DIRS}) target_link_libraries(xfreerdp ${XV_LIBRARIES}) diff --git a/config.h.in b/config.h.in index c43ca0cb0..804971331 100644 --- a/config.h.in +++ b/config.h.in @@ -18,9 +18,6 @@ #cmakedefine HAVE_STDBOOL_H #cmakedefine HAVE_INTTYPES_H -/* Found packages */ -#cmakedefine CUPS_FOUND - /* Endian */ #cmakedefine BIG_ENDIAN @@ -50,5 +47,4 @@ #cmakedefine WITH_DEBUG_REDIR #cmakedefine WITH_DEBUG_CLIPRDR #cmakedefine WITH_DEBUG_WND - #endif diff --git a/libfreerdp-kbd/CMakeLists.txt b/libfreerdp-kbd/CMakeLists.txt index 060846f55..e16fd78bb 100644 --- a/libfreerdp-kbd/CMakeLists.txt +++ b/libfreerdp-kbd/CMakeLists.txt @@ -30,16 +30,18 @@ set(FREERDP_KBD_SRCS add_library(freerdp-kbd ${FREERDP_KBD_SRCS}) find_suggested_package(X11) -if(X11_FOUND) +if(WITH_X11) target_link_libraries(freerdp-kbd ${X11_LIBRARIES}) endif() if(NOT APPLE) find_suggested_package(XKBFile) - if(XKBFILE_FOUND) - add_definitions(-DWITH_XKBFILE) - include_directories(${XKBFILE_INCLUDE_DIRS}) - target_link_libraries(freerdp-kbd ${XKBFILE_LIBRARIES}) + if(WITH_X11) + if(WITH_XKBFILE) + add_definitions(-DWITH_XKBFILE) + include_directories(${XKBFILE_INCLUDE_DIRS}) + target_link_libraries(freerdp-kbd ${XKBFILE_LIBRARIES}) + endif() endif() endif() diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt index 2b20d4ea6..b6d659652 100644 --- a/server/CMakeLists.txt +++ b/server/CMakeLists.txt @@ -26,7 +26,7 @@ if(NOT WIN32) # Build X11 Server find_suggested_package(X11) - if(X11_FOUND) + if(WITH_X11) add_subdirectory(X11) endif() diff --git a/server/X11/CMakeLists.txt b/server/X11/CMakeLists.txt index 9e9043b47..11a5cef5f 100644 --- a/server/X11/CMakeLists.txt +++ b/server/X11/CMakeLists.txt @@ -25,34 +25,34 @@ add_executable(xfreerdp-server xfreerdp.c) find_suggested_package(XShm) -if(XSHM_FOUND) +if(WITH_XSHM) add_definitions(-DWITH_XSHM) include_directories(${XSHM_INCLUDE_DIRS}) endif() find_suggested_package(Xext) -if(XEXT_FOUND) +if(WITH_XEXT) add_definitions(-DWITH_XEXT) include_directories(${XEXT_INCLUDE_DIRS}) target_link_libraries(xfreerdp-server ${XEXT_LIBRARIES}) endif() find_suggested_package(Xdamage) -if(XDAMAGE_FOUND) +if(WITH_XDAMAGE) add_definitions(-DWITH_XDAMAGE) include_directories(${XDAMAGE_INCLUDE_DIRS}) target_link_libraries(xfreerdp-server ${XDAMAGE_LIBRARIES}) endif() find_suggested_package(Xfixes) -if(XFIXES_FOUND) +if(WITH_XFIXES) add_definitions(-DWITH_XFIXES) include_directories(${XFIXES_INCLUDE_DIRS}) target_link_libraries(xfreerdp-server ${XFIXES_LIBRARIES}) endif() find_suggested_package(XTest) -if(XTEST_FOUND) +if(WITH_XTEST) add_definitions(-DWITH_XTEST) include_directories(${XTEST_INCLUDE_DIRS}) target_link_libraries(xfreerdp-server ${XTEST_LIBRARIES})