From e498e20c3e347fa3231d2bb472a5a4c8f1048cc1 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Sat, 10 May 2014 03:25:37 +0100 Subject: [PATCH] Improve CMake files to increase information dump --- CMakeLists.txt | 2 ++ cmake/CMakeMacros.cmake | 10 +++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 51edbe5..b25cb6b 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -120,3 +120,5 @@ status(" QT:" USE_QT4 THEN "QT4" ELSE "QT5" ) status(" OpenCV:" USE_OPENCV THEN YES ELSE NO) status(" FFMPEG:" USE_FFMPEG THEN YES ELSE NO) status(" Pixfc-sse:" USE_PIXFC THEN YES ELSE NO) +status("Features:") +status(" Modules List:" "${MODULES_LIST}" ) \ No newline at end of file diff --git a/cmake/CMakeMacros.cmake b/cmake/CMakeMacros.cmake index 7396746..a78b4c0 100644 --- a/cmake/CMakeMacros.cmake +++ b/cmake/CMakeMacros.cmake @@ -99,9 +99,13 @@ endfunction() macro(ADD_MODULE name file ) set(__modulename "Module${name}") - add_library( ${__modulename} ${SRC_DIR}/modules/${file} ) - set(MODULES_LIBS ${MODULES_LIBS} ${__modulename}) - ADD_DEFINITIONS( -DUSE_${name} ) + ADD_OPTION(MODULE_${name} "Use module ${name}" ON ) + if( MODULE_${name} ) + add_library( ${__modulename} ${SRC_DIR}/modules/${file} ) + set(MODULES_LIBS ${MODULES_LIBS} ${__modulename}) + add_definitions( -DUSE_${name} ) + LIST(APPEND MODULES_LIST ${name} ) + endif() unset(__modulename) endmacro()