From e471a664f923f517b68071f2e33fbb6ce070f8b7 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Mon, 8 Aug 2016 13:56:40 +0100 Subject: Remove deprecated Autotools and btool files. Please use CMake instead (bzr r15046) --- share/patterns/Makefile.am | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 share/patterns/Makefile.am (limited to 'share/patterns') diff --git a/share/patterns/Makefile.am b/share/patterns/Makefile.am deleted file mode 100644 index 8a0f02ba8..000000000 --- a/share/patterns/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ - -patternsdir = $(datadir)/inkscape/patterns - -patterns_DATA = \ - README \ - patterns.svg \ - patterns.svg.h - -patterns.svg.h: patterns.svg i18n.py - $(srcdir)/i18n.py $(srcdir)/patterns.svg > $(srcdir)/patterns.svg.h - -EXTRA_DIST = $(patterns_DATA) i18n.py -- cgit v1.2.3 From 3b4d977a93e600af8ab14c7078878907dc839f3b Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Fri, 11 Nov 2016 22:49:01 +0100 Subject: Add a make inkscape_pot to regen potfile (bzr r15239) --- share/patterns/CMakeLists.txt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'share/patterns') diff --git a/share/patterns/CMakeLists.txt b/share/patterns/CMakeLists.txt index de4a44797..4f038ffc3 100644 --- a/share/patterns/CMakeLists.txt +++ b/share/patterns/CMakeLists.txt @@ -1,10 +1,11 @@ add_custom_command( - OUTPUT patterns.svg.h - COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg > ${CMAKE_CURRENT_BINARY_DIR}/patterns.svg.h + OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg.h + COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg > ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg.h MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ) -add_custom_target(patterns_svg_h ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/patterns.svg.h) +set_source_files_properties(${CMAKE_SOURCE_DIR}/patterns.svg.h PROPERTIES GENERATED TRUE) +add_custom_target(patterns_svg_h ALL DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg.h) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/patterns.svg.h DESTINATION ${SHARE_INSTALL}/inkscape/patterns) +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg.h DESTINATION ${SHARE_INSTALL}/inkscape/patterns) install(FILES "patterns.svg" "README" DESTINATION ${SHARE_INSTALL}/inkscape/patterns) -- cgit v1.2.3 From 61b1ddd0599ee54f76494888524b156859134e85 Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Sat, 26 Nov 2016 17:15:27 +0100 Subject: CMake: Add ${INKSCAPE_SHARE_INSTALL} This is set to "share/inkscape" by default, on Windows we need to be able to install directly into "share" however (bzr r15278) --- share/patterns/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'share/patterns') diff --git a/share/patterns/CMakeLists.txt b/share/patterns/CMakeLists.txt index 4f038ffc3..ff234e894 100644 --- a/share/patterns/CMakeLists.txt +++ b/share/patterns/CMakeLists.txt @@ -7,5 +7,5 @@ add_custom_command( set_source_files_properties(${CMAKE_SOURCE_DIR}/patterns.svg.h PROPERTIES GENERATED TRUE) add_custom_target(patterns_svg_h ALL DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg.h) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg.h DESTINATION ${SHARE_INSTALL}/inkscape/patterns) -install(FILES "patterns.svg" "README" DESTINATION ${SHARE_INSTALL}/inkscape/patterns) +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg.h DESTINATION ${INKSCAPE_SHARE_INSTALL}/patterns) +install(FILES "patterns.svg" "README" DESTINATION ${INKSCAPE_SHARE_INSTALL}/patterns) -- cgit v1.2.3 From ce72d2493e5f43b3a37b3cf2b8f5d6b2bfaf7840 Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Sun, 27 Nov 2016 14:27:36 +0100 Subject: CMake: Explicitly call python At least on Windows this breaks if Python is not associated with .py files (and even if it is an arbitrary Python version that might be installed on the system is used) (bzr r15279) --- share/patterns/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share/patterns') diff --git a/share/patterns/CMakeLists.txt b/share/patterns/CMakeLists.txt index ff234e894..70cc61b58 100644 --- a/share/patterns/CMakeLists.txt +++ b/share/patterns/CMakeLists.txt @@ -1,6 +1,6 @@ add_custom_command( OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg.h - COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg > ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg.h + COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg > ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg.h MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/i18n.py ) -- cgit v1.2.3 From f5ecc3dc8d655e0998646a404a753782692c50b4 Mon Sep 17 00:00:00 2001 From: Eduard Braun Date: Sun, 30 Apr 2017 00:25:21 +0200 Subject: cmake: do not intalls header files generated by i18n.py (filters.svg.h, palletes.h, patterns.svg.h, symbols.h, templates.h) they seem to be of little use to the user... (bzr r15652) --- share/patterns/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) (limited to 'share/patterns') diff --git a/share/patterns/CMakeLists.txt b/share/patterns/CMakeLists.txt index 70cc61b58..10bb848b6 100644 --- a/share/patterns/CMakeLists.txt +++ b/share/patterns/CMakeLists.txt @@ -7,5 +7,4 @@ add_custom_command( set_source_files_properties(${CMAKE_SOURCE_DIR}/patterns.svg.h PROPERTIES GENERATED TRUE) add_custom_target(patterns_svg_h ALL DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg.h) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/patterns.svg.h DESTINATION ${INKSCAPE_SHARE_INSTALL}/patterns) install(FILES "patterns.svg" "README" DESTINATION ${INKSCAPE_SHARE_INSTALL}/patterns) -- cgit v1.2.3