Fixed CMakeLists.txt files to prevent static source files of being deleted by "make clean".
This commit is contained in:
parent
8408da40ca
commit
30c19e9c41
19 changed files with 39 additions and 22 deletions
|
|
@ -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")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue