Disabled client builds if WITH_CLIENT is not set.
This commit is contained in:
parent
b5288daea5
commit
d4d4271000
@ -19,7 +19,7 @@
|
|||||||
|
|
||||||
add_subdirectory(common)
|
add_subdirectory(common)
|
||||||
|
|
||||||
if(FREERDP_VENDOR)
|
if(FREERDP_VENDOR AND WITH_CLIENT)
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
add_subdirectory(Windows)
|
add_subdirectory(Windows)
|
||||||
else()
|
else()
|
||||||
@ -58,28 +58,28 @@ if(FREERDP_VENDOR)
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Pick up other clients
|
# Pick up other clients
|
||||||
|
if(WITH_CLIENT)
|
||||||
|
set(FILENAME "ModuleOptions.cmake")
|
||||||
|
file(GLOB FILEPATHS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/${FILENAME}")
|
||||||
|
|
||||||
set(FILENAME "ModuleOptions.cmake")
|
foreach(FILEPATH ${FILEPATHS})
|
||||||
file(GLOB FILEPATHS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/${FILENAME}")
|
if(${FILEPATH} MATCHES "^([^/]*)/+${FILENAME}")
|
||||||
|
string(REGEX REPLACE "^([^/]*)/+${FILENAME}" "\\1" FREERDP_CLIENT ${FILEPATH})
|
||||||
foreach(FILEPATH ${FILEPATHS})
|
set(FREERDP_CLIENT_ENABLED 0)
|
||||||
if(${FILEPATH} MATCHES "^([^/]*)/+${FILENAME}")
|
include(${FILEPATH})
|
||||||
string(REGEX REPLACE "^([^/]*)/+${FILENAME}" "\\1" FREERDP_CLIENT ${FILEPATH})
|
if(FREERDP_CLIENT_ENABLED)
|
||||||
set(FREERDP_CLIENT_ENABLED 0)
|
if(NOT (${FREERDP_CLIENT_VENDOR} MATCHES "FreeRDP"))
|
||||||
include(${FILEPATH})
|
list(APPEND FREERDP_EXTRA_CLIENTS ${FREERDP_CLIENT})
|
||||||
if(FREERDP_CLIENT_ENABLED)
|
if(${FREERDP_CLIENT_VENDOR} MATCHES "${VENDOR}")
|
||||||
if(NOT (${FREERDP_CLIENT_VENDOR} MATCHES "FreeRDP"))
|
set(CLIENT_VENDOR_PATH "client/${FREERDP_CLIENT}" PARENT_SCOPE)
|
||||||
list(APPEND FREERDP_EXTRA_CLIENTS ${FREERDP_CLIENT})
|
endif()
|
||||||
if(${FREERDP_CLIENT_VENDOR} MATCHES "${VENDOR}")
|
|
||||||
set(CLIENT_VENDOR_PATH "client/${FREERDP_CLIENT}" PARENT_SCOPE)
|
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endforeach()
|
||||||
endforeach()
|
|
||||||
|
|
||||||
foreach(FREERDP_CLIENT ${FREERDP_EXTRA_CLIENTS})
|
|
||||||
add_subdirectory(${FREERDP_CLIENT})
|
|
||||||
endforeach()
|
|
||||||
|
|
||||||
|
foreach(FREERDP_CLIENT ${FREERDP_EXTRA_CLIENTS})
|
||||||
|
add_subdirectory(${FREERDP_CLIENT})
|
||||||
|
endforeach()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user