From b15e152011b75a9b7edea73ee9c3f7460a3e54c6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marc-Andr=C3=A9=20Moreau?= Date: Wed, 3 Oct 2012 19:50:48 -0400 Subject: [PATCH] libwinpr: use ModuleOptions.cmake automatically --- winpr/libwinpr/CMakeLists.txt | 33 +++++++++----------------------- winpr/libwinpr/utils/ModuleOptions.cmake | 9 +++++++++ 2 files changed, 18 insertions(+), 24 deletions(-) create mode 100644 winpr/libwinpr/utils/ModuleOptions.cmake diff --git a/winpr/libwinpr/CMakeLists.txt b/winpr/libwinpr/CMakeLists.txt index 9a4d098..3ebf5cb 100644 --- a/winpr/libwinpr/CMakeLists.txt +++ b/winpr/libwinpr/CMakeLists.txt @@ -25,30 +25,15 @@ if(WITH_MONOLITHIC_BUILD) set(CMAKE_POSITION_INDEPENDENT_CODE ON) endif() -set(WINPR_MODULES - crt - utils - heap - path - io - file - error - environment - interlocked - handle - synch - thread - sysinfo - bcrypt - dsparse - asn1 - rpc - sspicli - sspi - registry - library - timezone - winsock) +set(FILENAME "ModuleOptions.cmake") +file(GLOB FILEPATHS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/${FILENAME}") + +foreach(FILEPATH ${FILEPATHS}) + if(${FILEPATH} MATCHES "^([^/]*)//${FILENAME}") + string(REGEX REPLACE "^([^/]*)//${FILENAME}" "\\1" WINPR_MODULE ${FILEPATH}) + set(WINPR_MODULES ${WINPR_MODULES} ${WINPR_MODULE}) + endif() +endforeach(FILEPATH) foreach(WINPR_MODULE ${WINPR_MODULES}) add_subdirectory(${WINPR_MODULE}) diff --git a/winpr/libwinpr/utils/ModuleOptions.cmake b/winpr/libwinpr/utils/ModuleOptions.cmake new file mode 100644 index 0000000..9e37ca6 --- /dev/null +++ b/winpr/libwinpr/utils/ModuleOptions.cmake @@ -0,0 +1,9 @@ + +set(MINWIN_LAYER "0") +set(MINWIN_GROUP "none") +set(MINWIN_MAJOR_VERSION "0") +set(MINWIN_MINOR_VERSION "0") +set(MINWIN_SHORT_NAME "utils") +set(MINWIN_LONG_NAME "WinPR Utils") +set(MODULE_LIBRARY_NAME "${MINWIN_SHORT_NAME}") + -- 2.7.4