Moved cmake macros to a separeted file.

Reviewer: Hugo Parente Lima <hugo.pl@gmail.com>
          Luciano Wolf <luciano.wolf@openbossa.org>

5 files changed, 170 insertions, 161 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e7091b9..db5ca01 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,15 +1,17 @@
-include(icecc.cmake) # this must be the first line!
+include(cmake/Macros/icecc.cmake) # this must be the first line!
 
 project(pysidebindings)
 
 cmake_minimum_required(VERSION 2.6)
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules/
+                      ${CMAKE_SOURCE_DIR}/cmake/Macros/
                       ${CMAKE_MODULE_PATH})
 find_package(PythonLibs REQUIRED)
 find_package(PythonInterpWithDebug REQUIRED)
 find_package(GeneratorRunner 0.6 REQUIRED)
 find_package(Shiboken 0.5 REQUIRED)
 find_package(Qt4 4.5.0 REQUIRED)
+include(FindQt4Extra)
 
 set(XVFB_EXEC "")
 option(USE_XVFB "Uses xvfb-run with the unit tests to avoid QtGui tests popping windows on the screen." FALSE)
diff --git a/PySide/CMakeLists.txt b/PySide/CMakeLists.txt
index 4e1f45a..c4aaf64 100644
--- a/PySide/CMakeLists.txt
+++ b/PySide/CMakeLists.txt
@@ -2,176 +2,17 @@ project(pyside)
 install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/__init__.py" "${CMAKE_CURRENT_SOURCE_DIR}/private.py"
         DESTINATION "${SITE_PACKAGE}/${BINDING_NAME}${pyside_SUFFIX}")
 
-macro(create_pyside_module module_name module_include_dir module_libraries module_deps module_typesystem_path module_sources typesystem_name)
-    string(TOLOWER ${module_name} _module)
-    string(REGEX REPLACE ^qt "" _module ${_module})
-    if (NOT EXISTS ${typesystem_name})
-        set(typesystem_path ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_${_module}.xml)
-    else()
-        set(typesystem_path ${typesystem_name})
-    endif()
-
-    add_custom_command(OUTPUT ${${module_sources}}
-                        COMMAND ${GENERATORRUNNER_BINARY} ${GENERATOR_EXTRA_FLAGS}
-                        ${CMAKE_BINARY_DIR}/PySide/global.h
-                        --include-paths=${pyside_SOURCE_DIR}${PATH_SEP}${QT_INCLUDE_DIR}
-                        --typesystem-paths=${pyside_SOURCE_DIR}${PATH_SEP}${${module_typesystem_path}}
-                        --output-directory=${CMAKE_CURRENT_BINARY_DIR}
-                        --license-file=${CMAKE_CURRENT_SOURCE_DIR}/../licensecomment.txt
-                        ${typesystem_path}
-                        --api-version=${SUPPORTED_QT_VERSION}
-                        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-                        COMMENT "Running generator for ${module_name}...")
-
-    include_directories(${module_name} ${${module_include_dir}} ${pyside_SOURCE_DIR})
-    add_library(${module_name} MODULE ${${module_sources}} ${${ARGN}})
-    set_target_properties(${module_name} PROPERTIES PREFIX "" LIBRARY_OUTPUT_DIRECTORY ${pyside_BINARY_DIR})
-    if(WIN32)
-        set_target_properties(${module_name} PROPERTIES SUFFIX ".pyd")
-        set(${module_name}_suffix ".pyd")
-    else()
-        set(${module_name}_suffix ".so")
-    endif()
-    target_link_libraries(${module_name} ${${module_libraries}})
-    if(${module_deps})
-        add_dependencies(${module_name} ${${module_deps}})
-    endif()
-
-
-    # install
-    install(TARGETS ${module_name} LIBRARY DESTINATION ${SITE_PACKAGE}/PySide)
-    string(TOLOWER ${module_name} lower_module_name)
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/${module_name}/pyside_${lower_module_name}_python.h
-            DESTINATION include/PySide${pyside_SUFFIX}/${module_name}/)
-    file(GLOB typesystem_files ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_*.xml ${typesystem_path})
-    install(FILES ${typesystem_files} DESTINATION share/PySide${pyside_SUFFIX}/typesystems)
-endmacro()
-
-#macro(check_qt_class_with_namespace module namespace class global_sources [namespace])
-macro(check_qt_class module class global_sources)
-    if (${ARGC} GREATER 3)
-        set (namespace ${ARGV3})
-        string(TOLOWER ${namespace} _namespace)
-    else ()
-        set (namespace "")
-    endif ()
-    if (${ARGC} GREATER 4)
-        set (include_file ${ARGV4})
-    else ()
-        set (include_file ${module})
-    endif ()
-    string(TOLOWER ${class} _class)
-    string(TOUPPER ${module} _module)
-    if (${namespace})
-        set(_cppfile ${CMAKE_CURRENT_BINARY_DIR}/PySide/${module}/${_namespace}_${_class}_wrapper.cpp)
-    else ()
-        set(_cppfile ${CMAKE_CURRENT_BINARY_DIR}/PySide/${module}/${_class}_wrapper.cpp)
-    endif ()
-    if (DEFINED PYSIDE_${class})
-        if (PYSIDE_${class})
-            list(APPEND ${global_sources} ${_cppfile})
-        endif()
-    else()
-        if (NOT ${namespace} STREQUAL "" )
-            set (NAMESPACE_USE "using namespace ${namespace};")
-        else ()
-            set (NAMESPACE_USE "")
-        endif ()
-        set(SRC_FILE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/test${class}.cxx)
-        file(WRITE ${SRC_FILE}
-             "#include <${include_file}>\n"
-             "#include <typeinfo>\n"
-	     "${NAMESPACE_USE}\n" 
-             "int main() { typeid(${class}); }\n"
-        )
-        try_compile(Q_WORKS ${CMAKE_BINARY_DIR}
-                    ${SRC_FILE}
-                    CMAKE_FLAGS
-                        "-DLINK_LIBRARIES=${QT_${_module}_LIBRARY}"
-                        "-DLINK_DIRECTORIES=${QT_LIBRARY_DIR}"
-                        "-DINCLUDE_DIRECTORIES=${QT_INCLUDE_DIR};${QT_${_module}_INCLUDE_DIR}"
-                    OUTPUT_VARIABLE OUTPUT)
-        file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeCheckQtClassTest.log ${OUTPUT})
-
-        set("PYSIDE_${class}" ${Q_WORKS} CACHE STRING "Has ${class} class been found?")
-        if(Q_WORKS)
-            message(STATUS "Checking for ${class} in ${module} -- found")
-            list(APPEND ${global_sources} ${_cppfile})
-        else()
-            message(STATUS "Checking for ${class} in ${module} -- not found")
-        endif()
-    endif()
-endmacro()
+include(PySideModules)
 
 # Configure include based on platform
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/global.h.in"
                "${CMAKE_CURRENT_BINARY_DIR}/global.h" @ONLY)
 
-# Only add subdirectory if the associated Qt module is found.
-macro(HAS_QT_MODULE var name)
-    if (NOT DISABLE_${name} AND ${var})
-        add_subdirectory(${name})
-    else()
-        set("if_${name}" "<!--" PARENT_SCOPE)
-        set("end_${name}" "-->" PARENT_SCOPE)
-    endif()
-endmacro()
-
 execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/__init__.py"
                                                               "${CMAKE_BINARY_DIR}/PySide/__init__.py")
 
 execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/private.py"
                                                               "${CMAKE_BINARY_DIR}/PySide/private.py")
-#
-# Try to find QtMultimedia
-# TODO: Remove this hack when cmake support QtMultimedia module
-if (NOT QT_QTMULTIMEDIA_FOUND AND ${QTVERSION} VERSION_GREATER 4.5.9)
-    find_path(QT_QTMULTIMEDIA_INCLUDE_DIR QtMultimedia
-            PATHS ${QT_HEADERS_DIR}/QtMultimedia
-                ${QT_LIBRARY_DIR}/QtMultimedia.framework/Headers
-            NO_DEFAULT_PATH)
-    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 ()
-
-# Try to find QtMaemo5 - it has to be done before QtGui to enable some QtMaemo5 flags
-# TODO: Remove this hack when cmake support QtMaemo5 module
-if (NOT QT_QTMAEMO5_FOUND AND ${QTVERSION} VERSION_GREATER 4.5.9)
-    find_path(QT_QTMAEMO5_INCLUDE_DIR QtMaemo5
-            PATHS ${QT_HEADERS_DIR}/QtMaemo5
-                ${QT_LIBRARY_DIR}/QtMaemo5.framework/Headers
-            NO_DEFAULT_PATH)
-    find_library(QT_QTMAEMO5_LIBRARY QtMaemo5 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
-    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 ()
-
-# Try to find QtDeclarative
-# TODO: Remove this hack when cmake support QtDeclarative module
-if (NOT QT_QTDECLARATIVE_FOUND AND ${QTVERSION} VERSION_GREATER 4.6.0)
-    find_path(QT_QTDECLARATIVE_INCLUDE_DIR QtDeclarative
-            PATHS ${QT_HEADERS_DIR}/QtDeclarative
-                ${QT_LIBRARY_DIR}/QtDeclarative.framework/Headers
-            NO_DEFAULT_PATH)
-    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 ()
-
 
 HAS_QT_MODULE(QT_QTCORE_FOUND QtCore)
 HAS_QT_MODULE(QT_QTGUI_FOUND QtGui)
diff --git a/cmake/Macros/FindQt4Extra.cmake b/cmake/Macros/FindQt4Extra.cmake
new file mode 100644
index 0000000..dc7e5c4
--- /dev/null
+++ b/cmake/Macros/FindQt4Extra.cmake
@@ -0,0 +1,54 @@
+#
+# Try to find QtMultimedia
+# TODO: Remove this hack when cmake support QtMultimedia module
+if (NOT QT_QTMULTIMEDIA_FOUND AND ${QTVERSION} VERSION_GREATER 4.5.9)
+    find_path(QT_QTMULTIMEDIA_INCLUDE_DIR QtMultimedia
+            PATHS ${QT_HEADERS_DIR}/QtMultimedia
+                ${QT_LIBRARY_DIR}/QtMultimedia.framework/Headers
+            NO_DEFAULT_PATH)
+    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()
+        #Replace this on documentation
+        set(if_QtMultimedia "<!--")
+        set(end_QtMultimedia "-->")
+    endif()
+endif ()
+
+# Try to find QtMaemo5 - it has to be done before QtGui to enable some QtMaemo5 flags
+# TODO: Remove this hack when cmake support QtMaemo5 module
+if (NOT QT_QTMAEMO5_FOUND AND ${QTVERSION} VERSION_GREATER 4.5.9)
+    find_path(QT_QTMAEMO5_INCLUDE_DIR QtMaemo5
+            PATHS ${QT_HEADERS_DIR}/QtMaemo5
+                ${QT_LIBRARY_DIR}/QtMaemo5.framework/Headers
+            NO_DEFAULT_PATH)
+    find_library(QT_QTMAEMO5_LIBRARY QtMaemo5 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+    if (QT_QTMAEMO5_INCLUDE_DIR AND QT_QTMAEMO5_LIBRARY)
+        set(QT_QTMAEMO5_FOUND ON)
+        set(Q_WS_MAEMO_5 ON)
+    else()
+        #Replace this on documentation
+        set(if_Maemo5 "<!--")
+        set(end_Maemo5 "-->")
+    endif()
+endif ()
+
+# Try to find QtDeclarative
+# TODO: Remove this hack when cmake support QtDeclarative module
+if (NOT QT_QTDECLARATIVE_FOUND AND ${QTVERSION} VERSION_GREATER 4.6.0)
+    find_path(QT_QTDECLARATIVE_INCLUDE_DIR QtDeclarative
+            PATHS ${QT_HEADERS_DIR}/QtDeclarative
+                ${QT_LIBRARY_DIR}/QtDeclarative.framework/Headers
+            NO_DEFAULT_PATH)
+    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()
+        #Replace this on documentation
+        set(if_QtDeclarative "<!--")
+        set(end_QtDeclarative "-->")
+    endif()
+endif ()
+
+
diff --git a/cmake/Macros/PySideModules.cmake b/cmake/Macros/PySideModules.cmake
new file mode 100644
index 0000000..639a0ab
--- /dev/null
+++ b/cmake/Macros/PySideModules.cmake
@@ -0,0 +1,112 @@
+macro(create_pyside_module module_name module_include_dir module_libraries module_deps module_typesystem_path module_sources typesystem_name)
+    string(TOLOWER ${module_name} _module)
+    string(REGEX REPLACE ^qt "" _module ${_module})
+    if (NOT EXISTS ${typesystem_name})
+        set(typesystem_path ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_${_module}.xml)
+    else()
+        set(typesystem_path ${typesystem_name})
+    endif()
+
+    add_custom_command(OUTPUT ${${module_sources}}
+                        COMMAND ${GENERATORRUNNER_BINARY} ${GENERATOR_EXTRA_FLAGS}
+                        ${CMAKE_BINARY_DIR}/PySide/global.h
+                        --include-paths=${pyside_SOURCE_DIR}${PATH_SEP}${QT_INCLUDE_DIR}
+                        --typesystem-paths=${pyside_SOURCE_DIR}${PATH_SEP}${${module_typesystem_path}}
+                        --output-directory=${CMAKE_CURRENT_BINARY_DIR}
+                        --license-file=${CMAKE_CURRENT_SOURCE_DIR}/../licensecomment.txt
+                        ${typesystem_path}
+                        --api-version=${SUPPORTED_QT_VERSION}
+                        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                        COMMENT "Running generator for ${module_name}...")
+
+    include_directories(${module_name} ${${module_include_dir}} ${pyside_SOURCE_DIR})
+    add_library(${module_name} MODULE ${${module_sources}} ${${ARGN}})
+    set_target_properties(${module_name} PROPERTIES PREFIX "" LIBRARY_OUTPUT_DIRECTORY ${pyside_BINARY_DIR})
+    if(WIN32)
+        set_target_properties(${module_name} PROPERTIES SUFFIX ".pyd")
+        set(${module_name}_suffix ".pyd")
+    else()
+        set(${module_name}_suffix ".so")
+    endif()
+    target_link_libraries(${module_name} ${${module_libraries}})
+    if(${module_deps})
+        add_dependencies(${module_name} ${${module_deps}})
+    endif()
+
+
+    # install
+    install(TARGETS ${module_name} LIBRARY DESTINATION ${SITE_PACKAGE}/PySide)
+    string(TOLOWER ${module_name} lower_module_name)
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PySide/${module_name}/pyside_${lower_module_name}_python.h
+            DESTINATION include/PySide${pyside_SUFFIX}/${module_name}/)
+    file(GLOB typesystem_files ${CMAKE_CURRENT_SOURCE_DIR}/typesystem_*.xml ${typesystem_path})
+    install(FILES ${typesystem_files} DESTINATION share/PySide${pyside_SUFFIX}/typesystems)
+endmacro()
+
+#macro(check_qt_class_with_namespace module namespace class global_sources [namespace])
+macro(check_qt_class module class global_sources)
+    if (${ARGC} GREATER 3)
+        set (namespace ${ARGV3})
+        string(TOLOWER ${namespace} _namespace)
+    else ()
+        set (namespace "")
+    endif ()
+    if (${ARGC} GREATER 4)
+        set (include_file ${ARGV4})
+    else ()
+        set (include_file ${module})
+    endif ()
+    string(TOLOWER ${class} _class)
+    string(TOUPPER ${module} _module)
+    if (${namespace})
+        set(_cppfile ${CMAKE_CURRENT_BINARY_DIR}/PySide/${module}/${_namespace}_${_class}_wrapper.cpp)
+    else ()
+        set(_cppfile ${CMAKE_CURRENT_BINARY_DIR}/PySide/${module}/${_class}_wrapper.cpp)
+    endif ()
+    if (DEFINED PYSIDE_${class})
+        if (PYSIDE_${class})
+            list(APPEND ${global_sources} ${_cppfile})
+        endif()
+    else()
+        if (NOT ${namespace} STREQUAL "" )
+            set (NAMESPACE_USE "using namespace ${namespace};")
+        else ()
+            set (NAMESPACE_USE "")
+        endif ()
+        set(SRC_FILE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/test${class}.cxx)
+        file(WRITE ${SRC_FILE}
+             "#include <${include_file}>\n"
+             "#include <typeinfo>\n"
+	     "${NAMESPACE_USE}\n" 
+             "int main() { typeid(${class}); }\n"
+        )
+        try_compile(Q_WORKS ${CMAKE_BINARY_DIR}
+                    ${SRC_FILE}
+                    CMAKE_FLAGS
+                        "-DLINK_LIBRARIES=${QT_${_module}_LIBRARY}"
+                        "-DLINK_DIRECTORIES=${QT_LIBRARY_DIR}"
+                        "-DINCLUDE_DIRECTORIES=${QT_INCLUDE_DIR};${QT_${_module}_INCLUDE_DIR}"
+                    OUTPUT_VARIABLE OUTPUT)
+        file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeCheckQtClassTest.log ${OUTPUT})
+
+        set("PYSIDE_${class}" ${Q_WORKS} CACHE STRING "Has ${class} class been found?")
+        if(Q_WORKS)
+            message(STATUS "Checking for ${class} in ${module} -- found")
+            list(APPEND ${global_sources} ${_cppfile})
+        else()
+            message(STATUS "Checking for ${class} in ${module} -- not found")
+        endif()
+    endif()
+endmacro()
+
+
+# Only add subdirectory if the associated Qt module is found.
+macro(HAS_QT_MODULE var name)
+    if (NOT DISABLE_${name} AND ${var})
+        add_subdirectory(${name})
+    else()
+        # Used on documentation to skip modules
+        set("if_${name}" "<!--" PARENT_SCOPE)
+        set("end_${name}" "-->" PARENT_SCOPE)
+    endif()
+endmacro()
diff --git a/icecc.cmake b/cmake/Macros/icecc.cmake
index b2bf071..b2bf071 100644
--- a/icecc.cmake
+++ b/cmake/Macros/icecc.cmake