jyapayne/PySide
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed CMakeLists.txt files to prevent static source files of being deleted by "make clean".

Browse source
This commit is contained in:
Marcelo Lira 2011-04-07 11:29:15 -03:00
commit 30c19e9c41
19 changed files with 39 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

3
PySide/QtCore/CMakeLists.txt
View file

@ -152,4 +152,5 @@ create_pyside_module(QtCore
QtCore_libraries QtCore_libraries
"" ""
QtCore_typesystem_path QtCore_typesystem_path
QtCore_SRC) QtCore_SRC
"")

4
PySide/QtDeclarative/CMakeLists.txt
View file

@ -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/qdeclarativescriptstring_wrapper.cpp
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtDeclarative/qdeclarativeview_wrapper.cpp ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtDeclarative/qdeclarativeview_wrapper.cpp
${CMAKE_CURRENT_BINARY_DIR}/PySide/QtDeclarative/qtdeclarative_module_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}") 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_libraries
QtDeclarative_deps QtDeclarative_deps
QtDeclarative_typesystem_path QtDeclarative_typesystem_path
QtDeclarative_SRC) QtDeclarative_SRC
QtDeclarative_registerType)

1
PySide/QtGui/CMakeLists.txt
View file

@ -423,6 +423,7 @@ create_pyside_module(QtGui
QtGui_deps QtGui_deps
QtGui_typesystem_path QtGui_typesystem_path
QtGui_SRC QtGui_SRC
""
${CMAKE_CURRENT_BINARY_DIR}/typesystem_gui.xml) ${CMAKE_CURRENT_BINARY_DIR}/typesystem_gui.xml)
install(FILES ${pyside_SOURCE_DIR}/qpytextobject.h DESTINATION include/PySide/QtGui/) install(FILES ${pyside_SOURCE_DIR}/qpytextobject.h DESTINATION include/PySide/QtGui/)

3
PySide/QtHelp/CMakeLists.txt
View file

@ -38,4 +38,5 @@ create_pyside_module(QtHelp
QtHelp_libraries QtHelp_libraries
QtHelp_deps QtHelp_deps
QtHelp_typesystem_path QtHelp_typesystem_path
QtHelp_SRC) QtHelp_SRC
"")

3
PySide/QtMaemo5/CMakeLists.txt
View file

@ -45,5 +45,6 @@ create_pyside_module(QtMaemo5
QtMaemo5_libraries QtMaemo5_libraries
QtMaemo5_deps QtMaemo5_deps
QtMaemo5_typesystem_path QtMaemo5_typesystem_path
QtMaemo5_SRC) QtMaemo5_SRC
"")

3
PySide/QtMultimedia/CMakeLists.txt
View file

@ -44,4 +44,5 @@ create_pyside_module(QtMultimedia
QtMultimedia_libraries QtMultimedia_libraries
QtMultimedia_deps QtMultimedia_deps
QtMultimedia_typesystem_path QtMultimedia_typesystem_path
QtMultimedia_SRC) QtMultimedia_SRC
"")

1
PySide/QtNetwork/CMakeLists.txt
View file

@ -79,4 +79,5 @@ create_pyside_module(QtNetwork
QtNetwork_typesystem_path QtNetwork_typesystem_path
QtNetwork_SRC QtNetwork_SRC
"" ""
""
QtNetwork_DROPPED_ENTRIES) QtNetwork_DROPPED_ENTRIES)

3
PySide/QtOpenGL/CMakeLists.txt
View file

@ -54,4 +54,5 @@ create_pyside_module(QtOpenGL
QtOpenGL_libraries QtOpenGL_libraries
QtOpenGL_deps QtOpenGL_deps
QtOpenGL_typesystem_path QtOpenGL_typesystem_path
QtOpenGL_SRC) QtOpenGL_SRC
"")

3
PySide/QtScript/CMakeLists.txt
View file

@ -45,4 +45,5 @@ create_pyside_module(QtScript
QtScript_libraries QtScript_libraries
QtScript_deps QtScript_deps
QtScript_typesystem_path QtScript_typesystem_path
QtScript_SRC) QtScript_SRC
"")

3
PySide/QtScriptTools/CMakeLists.txt
View file

@ -33,4 +33,5 @@ create_pyside_module(QtScriptTools
QtScriptTools_libraries QtScriptTools_libraries
QtScriptTools_deps QtScriptTools_deps
QtScriptTools_typesystem_path QtScriptTools_typesystem_path
QtScriptTools_SRC) QtScriptTools_SRC
"")

3
PySide/QtSql/CMakeLists.txt
View file

@ -43,4 +43,5 @@ create_pyside_module(QtSql
QtSql_libraries QtSql_libraries
QtSql_deps QtSql_deps
QtSql_typesystem_path QtSql_typesystem_path
QtSql_SRC) QtSql_SRC
"")

3
PySide/QtSvg/CMakeLists.txt
View file

@ -31,4 +31,5 @@ create_pyside_module(QtSvg
QtSvg_libraries QtSvg_libraries
QtSvg_deps QtSvg_deps
QtSvg_typesystem_path QtSvg_typesystem_path
QtSvg_SRC) QtSvg_SRC
"")

3
PySide/QtTest/CMakeLists.txt
View file

@ -29,4 +29,5 @@ create_pyside_module(QtTest
QtTest_libraries QtTest_libraries
QtTest_deps QtTest_deps
QtTest_typesystem_path QtTest_typesystem_path
QtTest_SRC) QtTest_SRC
"")

3
PySide/QtUiTools/CMakeLists.txt
View file

@ -33,5 +33,6 @@ create_pyside_module(QtUiTools
QtUiTools_libraries QtUiTools_libraries
QtUiTools_deps QtUiTools_deps
QtUiTools_typesystem_path QtUiTools_typesystem_path
QtUiTools_SRC) QtUiTools_SRC
"")

3
PySide/QtWebKit/CMakeLists.txt
View file

@ -63,5 +63,6 @@ create_pyside_module(QtWebKit
QtWebKit_libraries QtWebKit_libraries
QtWebKit_deps QtWebKit_deps
QtWebKit_typesystem_path QtWebKit_typesystem_path
QtWebKit_SRC) QtWebKit_SRC
"")

3
PySide/QtXml/CMakeLists.txt
View file

@ -56,4 +56,5 @@ create_pyside_module(QtXml
QtXml_libraries QtXml_libraries
QtXml_deps QtXml_deps
QtXml_typesystem_path QtXml_typesystem_path
QtXml_SRC) QtXml_SRC
"")

3
PySide/QtXmlPatterns/CMakeLists.txt
View file

@ -45,5 +45,6 @@ create_pyside_module(QtXmlPatterns
QtXmlPatterns_libraries QtXmlPatterns_libraries
QtXmlPatterns_deps QtXmlPatterns_deps
QtXmlPatterns_typesystem_path QtXmlPatterns_typesystem_path
QtXmlPatterns_SRC) QtXmlPatterns_SRC
"")

1
PySide/phonon/CMakeLists.txt
View file

@ -74,4 +74,5 @@ create_pyside_module(phonon
phonon_typesystem_path phonon_typesystem_path
phonon_SRC phonon_SRC
"" ""
""
phonon_DROPPED_ENTRIES) phonon_DROPPED_ENTRIES)

12
cmake/Macros/PySideModules.cmake
View file

@ -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(TOLOWER ${module_name} _module)
string(REGEX REPLACE ^qt "" _module ${_module}) string(REGEX REPLACE ^qt "" _module ${_module})
if(${ARGC} GREATER 6) if(${ARGC} GREATER 7)
set (typesystem_name ${ARGV6}) set (typesystem_name ${ARGV7})
else() else()
set (typesystem_name "") set (typesystem_name "")
endif() endif()
if(${ARGC} GREATER 7) if(${ARGC} GREATER 8)
string(REPLACE ";" "\\;" dropped_entries "${${ARGV7}}") string(REPLACE ";" "\\;" dropped_entries "${${ARGV8}}")
else() else()
set (dropped_entries "") set (dropped_entries "")
endif() endif()
@ -33,7 +33,7 @@ macro(create_pyside_module module_name module_include_dir module_libraries modul
COMMENT "Running generator for ${module_name}...") COMMENT "Running generator for ${module_name}...")
include_directories(${module_name} ${${module_include_dir}} ${pyside_SOURCE_DIR}) 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}) set_target_properties(${module_name} PROPERTIES PREFIX "" LIBRARY_OUTPUT_DIRECTORY ${pyside_BINARY_DIR})
if(WIN32) if(WIN32)
set_target_properties(${module_name} PROPERTIES SUFFIX ".pyd") set_target_properties(${module_name} PROPERTIES SUFFIX ".pyd")