diff options
| author | Marcelo Lira <marcelo.lira@openbossa.org> | 2011-04-07 11:29:15 -0300 |
|---|---|---|
| committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2012-03-08 16:54:10 -0300 |
| commit | 6efe441b766852764c4638f41b5ae556c93a9aa8 (patch) | |
| tree | c83cf955385762fdeb11e138198b9a6161d7ae55 /cmake/Macros | |
| parent | 45604383c13cd312d4a304fb0400c75e2765c243 (diff) | |
Fixed CMakeLists.txt files to prevent static source files of being deleted by "make clean".
Diffstat (limited to 'cmake/Macros')
| -rw-r--r-- | cmake/Macros/PySideModules.cmake | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cmake/Macros/PySideModules.cmake b/cmake/Macros/PySideModules.cmake index dc33989ba..6620f1d37 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") |