Various cleanups to CMakeLists.txt files

* Simplify endmacro(), endif() and else() statements
* Remove unused and redundant code
* Use AUTO_OS for holding the typesystem suffix (instead of MODULE_NAME)

Reviewed-by: Luciano Wolf <luciano.wolf@openbossa.org>
Reviewed-by: Hugo Parente Lima <hugo.lima@openbossa.org>
This commit is contained in:
Anderson Lizardo 2010-08-13 22:32:07 -04:00
commit 3c36d44472
11 changed files with 27 additions and 55 deletions

View file

@ -25,7 +25,7 @@ else()
if(NOT DISABLE_${name} AND ${var})
add_subdirectory(${name})
endif()
endmacro(TEST_QT_MODULE)
endmacro()
macro(PYSIDE_TEST)
string(REGEX MATCH "/([^/]+)//?([^/]+)\\.py" foo "${CMAKE_CURRENT_SOURCE_DIR}/${ARGV0}" )
@ -43,7 +43,7 @@ else()
TIMEOUT ${CTEST_TESTING_TIMEOUT}
WILL_FAIL ${EXPECT_TO_FAIL}
ENVIRONMENT "PYTHONPATH=${TEST_PYTHONPATH};${LIBRARY_PATH_VAR}=${TEST_LIBRARY_PATH}")
endmacro(PYSIDE_TEST)
endmacro()
# Try to find QtMultimedia
# TODO: Remove this hack when cmake support QtMultimedia module