diff options
| author | Hugo Parente Lima <hugo.pl@gmail.com> | 2010-09-24 15:34:20 -0300 |
|---|---|---|
| committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2010-09-24 16:12:05 -0300 |
| commit | 3e0af488ee5820f35462f381c5a1676dc9560a5d (patch) | |
| tree | c628028c0c85c32d2f3afbf779203a4331b205ee /PySide/CMakeLists.txt | |
| parent | 9eddff59405f9bfb94c0bb15da3d047eb7029958 (diff) | |
Fix bug#168 - "API documentation suggestions" and other fixes.
Reviewer: Luciano Wolf <luciano.wolf@openbossa.org>
Marcelo Lira <marcelo.lira@openbossa.org>
Diffstat (limited to 'PySide/CMakeLists.txt')
| -rw-r--r-- | PySide/CMakeLists.txt | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/PySide/CMakeLists.txt b/PySide/CMakeLists.txt index 8769d3a63..8a1f4d25a 100644 --- a/PySide/CMakeLists.txt +++ b/PySide/CMakeLists.txt @@ -88,15 +88,12 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/global.h.in" # Only add subdirectory if the associated Qt module is found. macro(HAS_QT_MODULE var name) -if (DISABLE_${name}) - message(STATUS "Generation of ${name} disabled.") -else() - if (${var}) + if (NOT DISABLE_${name} AND ${var}) add_subdirectory(${name}) else() - message(STATUS "${name} NOT found. ${name} support disabled.") + set("if_${name}" "<!--" PARENT_SCOPE) + set("end_${name}" "-->" PARENT_SCOPE) endif() -endif() endmacro() execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/__init__.py" @@ -115,6 +112,9 @@ if (NOT QT_QTMULTIMEDIA_FOUND AND ${QTVERSION} VERSION_GREATER 4.5.9) find_library(QT_QTMULTIMEDIA_LIBRARY QtMultimedia PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) if (QT_QTMULTIMEDIA_INCLUDE_DIR AND QT_QTMULTIMEDIA_LIBRARY) set(QT_QTMULTIMEDIA_FOUND ON) + else() + set(if_QtMultimedia "<!--" PARENT_SCOPE) + set(end_QtMultimedia "-->" PARENT_SCOPE) endif() endif () @@ -129,6 +129,9 @@ if (NOT QT_QTMAEMO5_FOUND AND ${QTVERSION} VERSION_GREATER 4.5.9) if (QT_QTMAEMO5_INCLUDE_DIR AND QT_QTMAEMO5_LIBRARY) set(QT_QTMAEMO5_FOUND ON) set(Q_WS_MAEMO_5 ON) + else() + set(if_Maemo5 "<!--" PARENT_SCOPE) + set(end_Maemo5 "-->" PARENT_SCOPE) endif() endif () @@ -142,6 +145,9 @@ if (NOT QT_QTDECLARATIVE_FOUND AND ${QTVERSION} VERSION_GREATER 4.6.0) find_library(QT_QTDECLARATIVE_LIBRARY QtDeclarative PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH) if (QT_QTDECLARATIVE_INCLUDE_DIR AND QT_QTDECLARATIVE_LIBRARY) set(QT_QTDECLARATIVE_FOUND ON) + else() + set(if_QtDeclarative "<!--" PARENT_SCOPE) + set(end_QtDeclarative "-->" PARENT_SCOPE) endif() endif () |