diff options
-rw-r--r-- | CMakeLists.txt | 10 | ||||
-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 |
5 files changed, 13 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2ede88128..42f308f64 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ set(CMAKE_CXX_FLAGS_DEBUG "-g -fno-common -Wall -fno-strict-aliasing -fvisibilit if (NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE Release) -endif (NOT CMAKE_BUILD_TYPE) +endif() find_package(PythonLibs REQUIRED) find_package(PythonInterp REQUIRED) @@ -26,19 +26,19 @@ set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE PATH "The s if (NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE Release) -endif (NOT CMAKE_BUILD_TYPE) +endif() include(${QT_USE_FILE}) if (${QTVERSION} VERSION_LESS 4.5.0) message(FATAL_ERROR "You need Qt4.5, found ${QTVERSION}.") -endif (${QTVERSION} VERSION_LESS 4.5.0) +endif() set(BINDING_VERSION ${BINDING_API_VERSION}.${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}) find_program(GENERATOR generatorrunner REQUIRED) if (NOT GENERATOR) message(FATAL_ERROR "You need to specify GENERATOR variable (-DGENERATOR=value)") -endif (NOT GENERATOR) +endif() # uninstall target configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake" @@ -61,7 +61,7 @@ execute_process( OUTPUT_STRIP_TRAILING_WHITESPACE) if (NOT SITE_PACKAGE) message(FATAL_ERROR "Could not detect Python module installation directory.") -endif (NOT SITE_PACKAGE) +endif() set(GENERATOR_EXTRA_FLAGS --generatorSet=shiboken --enable-parent-ctor-heuristic --enable-pyside-extensions --enable-return-value-heuristic) 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) |