diff options
| author | Marcelo Lira <marcelo.lira@openbossa.org> | 2011-04-07 11:29:15 -0300 |
|---|---|---|
| committer | Marcelo Lira <marcelo.lira@openbossa.org> | 2011-04-14 19:15:56 -0300 |
| commit | 30c19e9c41368559104a9943f1ab71b2995186b3 (patch) | |
| tree | 0881a09636ed9fd0b69612787a4bd65e39de14c9 /cmake | |
| parent | 8408da40caaa7343b340ae9ddc957639d00966fa (diff) | |
| download | pyside-30c19e9c41368559104a9943f1ab71b2995186b3.tar.gz pyside-30c19e9c41368559104a9943f1ab71b2995186b3.tar.xz pyside-30c19e9c41368559104a9943f1ab71b2995186b3.zip | |
Fixed CMakeLists.txt files to prevent static source files of being deleted by "make clean".
Diffstat (limited to 'cmake')
| -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 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") |