summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--PySide/QtCore/CMakeLists.txt3
-rw-r--r--PySide/QtDeclarative/CMakeLists.txt4
-rw-r--r--PySide/QtGui/CMakeLists.txt1
-rw-r--r--PySide/QtHelp/CMakeLists.txt3
-rw-r--r--PySide/QtMaemo5/CMakeLists.txt3
-rw-r--r--PySide/QtMultimedia/CMakeLists.txt3
-rw-r--r--PySide/QtNetwork/CMakeLists.txt1
-rw-r--r--PySide/QtOpenGL/CMakeLists.txt3
-rw-r--r--PySide/QtScript/CMakeLists.txt3
-rw-r--r--PySide/QtScriptTools/CMakeLists.txt3
-rw-r--r--PySide/QtSql/CMakeLists.txt3
-rw-r--r--PySide/QtSvg/CMakeLists.txt3
-rw-r--r--PySide/QtTest/CMakeLists.txt3
-rw-r--r--PySide/QtUiTools/CMakeLists.txt3
-rw-r--r--PySide/QtWebKit/CMakeLists.txt3
-rw-r--r--PySide/QtXml/CMakeLists.txt3
-rw-r--r--PySide/QtXmlPatterns/CMakeLists.txt3
-rw-r--r--PySide/phonon/CMakeLists.txt1
-rw-r--r--cmake/Macros/PySideModules.cmake12
19 files changed, 39 insertions, 22 deletions
diff --git a/PySide/QtCore/CMakeLists.txt b/PySide/QtCore/CMakeLists.txt
index c486b7c..e0a82c6 100644
--- a/PySide/QtCore/CMakeLists.txt
+++ b/PySide/QtCore/CMakeLists.txt
@@ -152,4 +152,5 @@ create_pyside_module(QtCore
QtCore_libraries
""
QtCore_typesystem_path
- QtCore_SRC)
+ QtCore_SRC
+ "")
diff --git a/PySide/QtDeclarative/CMakeLists.txt b/PySide/QtDeclarative/CMakeLists.txt
index 591b6ac..01cf877 100644
--- a/PySide/QtDeclarative/CMakeLists.txt
+++ b/PySide/QtDeclarative/CMakeLists.txt
@@ -21,7 +21,6 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtDeclarative/qdeclarativeproperty_wrapper.cp
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtDeclarative/qdeclarativescriptstring_wrapper.cpp
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtDeclarative/qdeclarativeview_wrapper.cpp
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtDeclarative/qtdeclarative_module_wrapper.cpp
-${QtDeclarative_registerType}
)
set(QtDeclarative_typesystem_path "${QtCore_SOURCE_DIR}${PATH_SEP}${QtGui_SOURCE_DIR}${PATH_SEP}${QtNetwork_SOURCE_DIR}${PATH_SEP}${QtDeclarative_SOURCE_DIR}${PATH_SEP}${QtGui_BINARY_DIR}")
@@ -58,5 +57,6 @@ create_pyside_module(QtDeclarative
QtDeclarative_libraries
QtDeclarative_deps
QtDeclarative_typesystem_path
- QtDeclarative_SRC)
+ QtDeclarative_SRC
+ QtDeclarative_registerType)
diff --git a/PySide/QtGui/CMakeLists.txt b/PySide/QtGui/CMakeLists.txt
index c25a95e..8587472 100644
--- a/PySide/QtGui/CMakeLists.txt
+++ b/PySide/QtGui/CMakeLists.txt
@@ -423,6 +423,7 @@ create_pyside_module(QtGui
QtGui_deps
QtGui_typesystem_path
QtGui_SRC
+ ""
${CMAKE_CURRENT_BINARY_DIR}/typesystem_gui.xml)
install(FILES ${pyside_SOURCE_DIR}/qpytextobject.h DESTINATION include/PySide/QtGui/)
diff --git a/PySide/QtHelp/CMakeLists.txt b/PySide/QtHelp/CMakeLists.txt
index 96c2375..0ca0272 100644
--- a/PySide/QtHelp/CMakeLists.txt
+++ b/PySide/QtHelp/CMakeLists.txt
@@ -38,4 +38,5 @@ create_pyside_module(QtHelp
QtHelp_libraries
QtHelp_deps
QtHelp_typesystem_path
- QtHelp_SRC)
+ QtHelp_SRC
+ "")
diff --git a/PySide/QtMaemo5/CMakeLists.txt b/PySide/QtMaemo5/CMakeLists.txt
index ff60a8f..30bf15c 100644
--- a/PySide/QtMaemo5/CMakeLists.txt
+++ b/PySide/QtMaemo5/CMakeLists.txt
@@ -45,5 +45,6 @@ create_pyside_module(QtMaemo5
QtMaemo5_libraries
QtMaemo5_deps
QtMaemo5_typesystem_path
- QtMaemo5_SRC)
+ QtMaemo5_SRC
+ "")
diff --git a/PySide/QtMultimedia/CMakeLists.txt b/PySide/QtMultimedia/CMakeLists.txt
index 22c921d..8823838 100644
--- a/PySide/QtMultimedia/CMakeLists.txt
+++ b/PySide/QtMultimedia/CMakeLists.txt
@@ -44,4 +44,5 @@ create_pyside_module(QtMultimedia
QtMultimedia_libraries
QtMultimedia_deps
QtMultimedia_typesystem_path
- QtMultimedia_SRC)
+ QtMultimedia_SRC
+ "")
diff --git a/PySide/QtNetwork/CMakeLists.txt b/PySide/QtNetwork/CMakeLists.txt
index 0f2273a..9149202 100644
--- a/PySide/QtNetwork/CMakeLists.txt
+++ b/PySide/QtNetwork/CMakeLists.txt
@@ -79,4 +79,5 @@ create_pyside_module(QtNetwork
QtNetwork_typesystem_path
QtNetwork_SRC
""
+ ""
QtNetwork_DROPPED_ENTRIES)
diff --git a/PySide/QtOpenGL/CMakeLists.txt b/PySide/QtOpenGL/CMakeLists.txt
index 719f46c..44ba1c1 100644
--- a/PySide/QtOpenGL/CMakeLists.txt
+++ b/PySide/QtOpenGL/CMakeLists.txt
@@ -54,4 +54,5 @@ create_pyside_module(QtOpenGL
QtOpenGL_libraries
QtOpenGL_deps
QtOpenGL_typesystem_path
- QtOpenGL_SRC)
+ QtOpenGL_SRC
+ "")
diff --git a/PySide/QtScript/CMakeLists.txt b/PySide/QtScript/CMakeLists.txt
index b4ec794..88b0a06 100644
--- a/PySide/QtScript/CMakeLists.txt
+++ b/PySide/QtScript/CMakeLists.txt
@@ -45,4 +45,5 @@ create_pyside_module(QtScript
QtScript_libraries
QtScript_deps
QtScript_typesystem_path
- QtScript_SRC)
+ QtScript_SRC
+ "")
diff --git a/PySide/QtScriptTools/CMakeLists.txt b/PySide/QtScriptTools/CMakeLists.txt
index a110f15..575dcc3 100644
--- a/PySide/QtScriptTools/CMakeLists.txt
+++ b/PySide/QtScriptTools/CMakeLists.txt
@@ -33,4 +33,5 @@ create_pyside_module(QtScriptTools
QtScriptTools_libraries
QtScriptTools_deps
QtScriptTools_typesystem_path
- QtScriptTools_SRC)
+ QtScriptTools_SRC
+ "")
diff --git a/PySide/QtSql/CMakeLists.txt b/PySide/QtSql/CMakeLists.txt
index 204058e..7da42d4 100644
--- a/PySide/QtSql/CMakeLists.txt
+++ b/PySide/QtSql/CMakeLists.txt
@@ -43,4 +43,5 @@ create_pyside_module(QtSql
QtSql_libraries
QtSql_deps
QtSql_typesystem_path
- QtSql_SRC)
+ QtSql_SRC
+ "")
diff --git a/PySide/QtSvg/CMakeLists.txt b/PySide/QtSvg/CMakeLists.txt
index a1e3eb6..b1e5477 100644
--- a/PySide/QtSvg/CMakeLists.txt
+++ b/PySide/QtSvg/CMakeLists.txt
@@ -31,4 +31,5 @@ create_pyside_module(QtSvg
QtSvg_libraries
QtSvg_deps
QtSvg_typesystem_path
- QtSvg_SRC)
+ QtSvg_SRC
+ "")
diff --git a/PySide/QtTest/CMakeLists.txt b/PySide/QtTest/CMakeLists.txt
index aaf4dd5..fea841d 100644
--- a/PySide/QtTest/CMakeLists.txt
+++ b/PySide/QtTest/CMakeLists.txt
@@ -29,4 +29,5 @@ create_pyside_module(QtTest
QtTest_libraries
QtTest_deps
QtTest_typesystem_path
- QtTest_SRC)
+ QtTest_SRC
+ "")
diff --git a/PySide/QtUiTools/CMakeLists.txt b/PySide/QtUiTools/CMakeLists.txt
index 5c68b11..195cb81 100644
--- a/PySide/QtUiTools/CMakeLists.txt
+++ b/PySide/QtUiTools/CMakeLists.txt
@@ -33,5 +33,6 @@ create_pyside_module(QtUiTools
QtUiTools_libraries
QtUiTools_deps
QtUiTools_typesystem_path
- QtUiTools_SRC)
+ QtUiTools_SRC
+ "")
diff --git a/PySide/QtWebKit/CMakeLists.txt b/PySide/QtWebKit/CMakeLists.txt
index c13a04a..83445db 100644
--- a/PySide/QtWebKit/CMakeLists.txt
+++ b/PySide/QtWebKit/CMakeLists.txt
@@ -63,5 +63,6 @@ create_pyside_module(QtWebKit
QtWebKit_libraries
QtWebKit_deps
QtWebKit_typesystem_path
- QtWebKit_SRC)
+ QtWebKit_SRC
+ "")
diff --git a/PySide/QtXml/CMakeLists.txt b/PySide/QtXml/CMakeLists.txt
index 5d9c6a8..a06c710 100644
--- a/PySide/QtXml/CMakeLists.txt
+++ b/PySide/QtXml/CMakeLists.txt
@@ -56,4 +56,5 @@ create_pyside_module(QtXml
QtXml_libraries
QtXml_deps
QtXml_typesystem_path
- QtXml_SRC)
+ QtXml_SRC
+ "")
diff --git a/PySide/QtXmlPatterns/CMakeLists.txt b/PySide/QtXmlPatterns/CMakeLists.txt
index 85f238e..0d789ff 100644
--- a/PySide/QtXmlPatterns/CMakeLists.txt
+++ b/PySide/QtXmlPatterns/CMakeLists.txt
@@ -45,5 +45,6 @@ create_pyside_module(QtXmlPatterns
QtXmlPatterns_libraries
QtXmlPatterns_deps
QtXmlPatterns_typesystem_path
- QtXmlPatterns_SRC)
+ QtXmlPatterns_SRC
+ "")
diff --git a/PySide/phonon/CMakeLists.txt b/PySide/phonon/CMakeLists.txt
index 2adb25d..c11fe43 100644
--- a/PySide/phonon/CMakeLists.txt
+++ b/PySide/phonon/CMakeLists.txt
@@ -74,4 +74,5 @@ create_pyside_module(phonon
phonon_typesystem_path
phonon_SRC
""
+ ""
phonon_DROPPED_ENTRIES)
diff --git a/cmake/Macros/PySideModules.cmake b/cmake/Macros/PySideModules.cmake
index fb74c5b..29bea6a 100644
--- a/cmake/Macros/PySideModules.cmake
+++ b/cmake/Macros/PySideModules.cmake
@@ -1,14 +1,14 @@
-macro(create_pyside_module module_name module_include_dir module_libraries module_deps module_typesystem_path module_sources)
+macro(create_pyside_module module_name module_include_dir module_libraries module_deps module_typesystem_path module_sources module_static_sources)
string(TOLOWER ${module_name} _module)
string(REGEX REPLACE ^qt "" _module ${_module})
- if(${ARGC} GREATER 6)
- set (typesystem_name ${ARGV6})
+ if(${ARGC} GREATER 7)
+ set (typesystem_name ${ARGV7})
else()
set (typesystem_name "")
endif()
- if(${ARGC} GREATER 7)
- string(REPLACE ";" "\\;" dropped_entries "${${ARGV7}}")
+ if(${ARGC} GREATER 8)
+ string(REPLACE ";" "\\;" dropped_entries "${${ARGV8}}")
else()
set (dropped_entries "")
endif()
@@ -33,7 +33,7 @@ macro(create_pyside_module module_name module_include_dir module_libraries modul
COMMENT "Running generator for ${module_name}...")
include_directories(${module_name} ${${module_include_dir}} ${pyside_SOURCE_DIR})
- add_library(${module_name} MODULE ${${module_sources}})
+ add_library(${module_name} MODULE ${${module_sources}} ${${module_static_sources}})
set_target_properties(${module_name} PROPERTIES PREFIX "" LIBRARY_OUTPUT_DIRECTORY ${pyside_BINARY_DIR})
if(WIN32)
set_target_properties(${module_name} PROPERTIES SUFFIX ".pyd")