diff options
| author | Anderson Lizardo <anderson.lizardo@openbossa.org> | 2010-02-05 15:58:35 -0400 |
|---|---|---|
| committer | Hugo Lima <hugo.lima@openbossa.org> | 2010-02-05 17:54:00 -0200 |
| commit | dac9954e97ab1054ace55ccff9b527f5f65c19d6 (patch) | |
| tree | 369b84fe18739ad486de8c67bbf1b4a8d35e0888 /PySide | |
| parent | c1d5619a6fdb47797fc7046a1cb83655e8595186 (diff) | |
Simplify "else" and "endif" statements
Reviewed by Hugo Parente <hugo.lima@openbossa.org>
Diffstat (limited to 'PySide')
| -rw-r--r-- | PySide/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | PySide/QtCore/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | PySide/QtGui/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | PySide/QtNetwork/CMakeLists.txt | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/PySide/CMakeLists.txt b/PySide/CMakeLists.txt index 305201fa7..8e4e901b2 100644 --- a/PySide/CMakeLists.txt +++ b/PySide/CMakeLists.txt @@ -22,9 +22,9 @@ IF (${var}) add_subdirectory(${name}) execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink "${CMAKE_CURRENT_BINARY_DIR}/${name}/${name}${CMAKE_SHARED_MODULE_SUFFIX}" "${CMAKE_BINARY_DIR}/PySide/${name}${CMAKE_SHARED_MODULE_SUFFIX}") -else (${var}) +else() message(STATUS "${name} NOT found. ${name} support disabled.") -endif (${var}) +endif() endmacro(HAS_QT_MODULE) execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink "${CMAKE_CURRENT_SOURCE_DIR}/__init__.py" diff --git a/PySide/QtCore/CMakeLists.txt b/PySide/QtCore/CMakeLists.txt index e642544e8..157a5c79f 100644 --- a/PySide/QtCore/CMakeLists.txt +++ b/PySide/QtCore/CMakeLists.txt @@ -2,7 +2,7 @@ project(QtCore) if (${QT_VERSION_MAJOR} EQUAL 4 AND ${QT_VERSION_MINOR} LESS 6) set (QtCore_46_SRC ) -else (${QT_VERSION_MAJOR} EQUAL 4 AND ${QT_VERSION_MINOR} LESS 6) +else() set(QtCore_46_SRC ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qeasingcurve_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qabstractanimation_wrapper.cpp @@ -25,7 +25,7 @@ else (${QT_VERSION_MAJOR} EQUAL 4 AND ${QT_VERSION_MINOR} LESS 6) ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qstatemachine_wrappedevent_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/${BINDING_NAME}/QtCore/qvariantanimation_wrapper.cpp ) -endif (${QT_VERSION_MAJOR} EQUAL 4 AND ${QT_VERSION_MINOR} LESS 6) +endif() set(QtCore_SRC ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtCore/qabstracteventdispatcher_wrapper.cpp diff --git a/PySide/QtGui/CMakeLists.txt b/PySide/QtGui/CMakeLists.txt index 7d35d04c3..8a589d90f 100644 --- a/PySide/QtGui/CMakeLists.txt +++ b/PySide/QtGui/CMakeLists.txt @@ -44,13 +44,13 @@ elseif(Q_WS_MAC) set(MODULE_NAME gui_mac) set(SPECIFIC_OS_FILES ) -else(Q_WS_MAC) +else() message(FATAL_ERROR "OS not supported") endif(Q_WS_X11) if (${QT_VERSION_MAJOR} EQUAL 4 AND ${QT_VERSION_MINOR} LESS 6) set (QtGui_46_SRC ) -else (${QT_VERSION_MAJOR} EQUAL 4 AND ${QT_VERSION_MINOR} LESS 6) +else() set(QtGui_46_SRC ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qmatrix2x2_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qmatrix2x3_wrapper.cpp diff --git a/PySide/QtNetwork/CMakeLists.txt b/PySide/QtNetwork/CMakeLists.txt index 6e847a0d4..b189ac025 100644 --- a/PySide/QtNetwork/CMakeLists.txt +++ b/PySide/QtNetwork/CMakeLists.txt @@ -43,13 +43,13 @@ elseif(Q_WS_MAC) set(MODULE_NAME network_mac) set(SPECIFIC_OS_FILES ) -else(Q_WS_MAC) +else() message(FATAL_ERROR "OS not supported") endif(Q_WS_X11) if (${QT_VERSION_MAJOR} EQUAL 4 AND ${QT_VERSION_MINOR} LESS 6) set (QtNetwork_46_SRC ) -else (${QT_VERSION_MAJOR} EQUAL 4 AND ${QT_VERSION_MINOR} LESS 6) +else() set(QtNetwork_46_SRC ) endif (${QT_VERSION_MAJOR} EQUAL 4 AND ${QT_VERSION_MINOR} LESS 6) |