Commit 8a285146 authored by Victor Yacovlev's avatar Victor Yacovlev

Removed legacy .svn* file ignore mask for resources copying

parent acc54afb
......@@ -48,11 +48,9 @@ macro(copyResources pluginDir)
set(SRC_RES ${CMAKE_SOURCE_DIR}/share/kumir2/${pluginDir}/)
file(GLOB_RECURSE resfiles RELATIVE ${SRC_RES} ${SRC_RES}/*)
foreach(res IN ITEMS ${resfiles})
if(NOT ${res} MATCHES .svn*)
get_filename_component(subdir ${res} PATH)
file(MAKE_DIRECTORY ${SHARE_PATH}/${pluginDir}/${subdir})
file(COPY ${CMAKE_SOURCE_DIR}/share/kumir2/${pluginDir}/${res} DESTINATION ${SHARE_PATH}/${pluginDir}/${subdir})
install(FILES ${SHARE_PATH}/${pluginDir}/${res} DESTINATION ${RESOURCES_DIR}/${pluginDir}/${subdir})
endif()
endforeach(res)
endmacro(copyResources)
......@@ -62,12 +62,10 @@ macro(copyResources pluginDir)
set(SRC_RES ${CMAKE_SOURCE_DIR}/share/kumir2/${pluginDir}/)
file(GLOB_RECURSE resfiles RELATIVE ${SRC_RES} ${SRC_RES}/*)
foreach(res IN ITEMS ${resfiles})
if(NOT ${res} MATCHES .svn*)
get_filename_component(subdir ${res} PATH)
file(MAKE_DIRECTORY ${SHARE_PATH}/${pluginDir}/${subdir})
file(COPY ${CMAKE_SOURCE_DIR}/share/kumir2/${pluginDir}/${res} DESTINATION ${SHARE_PATH}/${pluginDir}/${subdir})
install(FILES ${SHARE_PATH}/${pluginDir}/${res} DESTINATION ${RESOURCES_DIR}/${pluginDir}/${subdir})
endif()
endforeach(res)
endmacro(copyResources)
......@@ -75,7 +73,7 @@ macro(copyResourcesExcl pluginDir exclPattern)
set(SRC_RES ${CMAKE_SOURCE_DIR}/share/kumir2/${pluginDir}/)
file(GLOB_RECURSE resfiles RELATIVE ${SRC_RES} ${SRC_RES}/*)
foreach(res IN ITEMS ${resfiles})
if((NOT ${res} MATCHES .svn*) AND (NOT ${res} MATCHES ${exclPattern}))
if(NOT ${res} MATCHES ${exclPattern})
get_filename_component(subdir ${res} PATH)
file(MAKE_DIRECTORY ${SHARE_PATH}/${pluginDir}/${subdir})
file(COPY ${CMAKE_SOURCE_DIR}/share/kumir2/${pluginDir}/${res} DESTINATION ${SHARE_PATH}/${pluginDir}/${subdir})
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment