diff options
Diffstat (limited to 'navit/textures')
| -rw-r--r-- | navit/textures/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | navit/textures/cemetery.svg | 11 | ||||
| -rw-r--r-- | navit/textures/diagonal-stripes-gray.svg | 11 | ||||
| -rw-r--r-- | navit/textures/diagonal-stripes.svg | 11 | ||||
| -rw-r--r-- | navit/textures/quarry.svg | 11 | ||||
| -rw-r--r-- | navit/textures/scrub.svg | 11 | ||||
| -rw-r--r-- | navit/textures/wetland.svg | 11 | ||||
| -rw-r--r-- | navit/textures/wood.svg | 11 |
8 files changed, 80 insertions, 1 deletions
diff --git a/navit/textures/CMakeLists.txt b/navit/textures/CMakeLists.txt index 5eb1fcf7e..b59a0a17f 100644 --- a/navit/textures/CMakeLists.txt +++ b/navit/textures/CMakeLists.txt @@ -30,7 +30,7 @@ macro(convert_to_png TEXTURE_INPUT TEXTURE_OUTPUT SCALE) else() set(SCALE_ARGS) endif() - set(COMMAND_ARGS --without-gui --export-background-opacity=0 --export-png ${TEXTURE_OUTPUT} ${SCALE_ARGS} ${TEXTURE_INPUT}) + set(COMMAND_ARGS --export-type=png --export-background-opacity=0 ${SCALE_ARGS} --export-filename=${TEXTURE_OUTPUT} ${TEXTURE_INPUT}) else() message(FATAL_ERROR "no svg2png converter defined here.") endif() @@ -110,6 +110,7 @@ foreach (TEXTURE_SRC ${FILES_TO_PNG}) endforeach() +if (NOT ${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR} ) foreach (TEXTURE_FILE ${TEXTURES_TO_COPY}) add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${TEXTURE_FILE}" DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${TEXTURE_FILE}" @@ -118,6 +119,7 @@ foreach (TEXTURE_FILE ${TEXTURES_TO_COPY}) ) list(APPEND TEXTURE_TARGETS "${CMAKE_CURRENT_BINARY_DIR}/${TEXTURE_FILE}") endforeach() +endif() add_custom_target(textures ALL DEPENDS ${TEXTURE_TARGETS}) add_custom_target(textures_resource COMMAND mkdir -p ../resources/share/navit/textures COMMAND cp ${TEXTURE_TARGETS} ../resources/share/navit/textures) diff --git a/navit/textures/cemetery.svg b/navit/textures/cemetery.svg index f9683d378..a0a34a37a 100644 --- a/navit/textures/cemetery.svg +++ b/navit/textures/cemetery.svg @@ -19,7 +19,18 @@ <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> <dc:title></dc:title> + <cc:license + rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" /> </cc:Work> + <cc:License + rdf:about="http://creativecommons.org/publicdomain/zero/1.0/"> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Reproduction" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Distribution" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /> + </cc:License> </rdf:RDF> </metadata> <defs diff --git a/navit/textures/diagonal-stripes-gray.svg b/navit/textures/diagonal-stripes-gray.svg index 7b6858521..6337ced17 100644 --- a/navit/textures/diagonal-stripes-gray.svg +++ b/navit/textures/diagonal-stripes-gray.svg @@ -46,7 +46,18 @@ <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> <dc:title></dc:title> + <cc:license + rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" /> </cc:Work> + <cc:License + rdf:about="http://creativecommons.org/publicdomain/zero/1.0/"> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Reproduction" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Distribution" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /> + </cc:License> </rdf:RDF> </metadata> <g diff --git a/navit/textures/diagonal-stripes.svg b/navit/textures/diagonal-stripes.svg index a5ba67996..9bf8e92a4 100644 --- a/navit/textures/diagonal-stripes.svg +++ b/navit/textures/diagonal-stripes.svg @@ -46,7 +46,18 @@ <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> <dc:title></dc:title> + <cc:license + rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" /> </cc:Work> + <cc:License + rdf:about="http://creativecommons.org/publicdomain/zero/1.0/"> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Reproduction" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Distribution" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /> + </cc:License> </rdf:RDF> </metadata> <g diff --git a/navit/textures/quarry.svg b/navit/textures/quarry.svg index 1de09a22c..b6ecddd7f 100644 --- a/navit/textures/quarry.svg +++ b/navit/textures/quarry.svg @@ -42,7 +42,18 @@ <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> <dc:title></dc:title> + <cc:license + rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" /> </cc:Work> + <cc:License + rdf:about="http://creativecommons.org/publicdomain/zero/1.0/"> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Reproduction" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Distribution" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /> + </cc:License> </rdf:RDF> </metadata> <defs diff --git a/navit/textures/scrub.svg b/navit/textures/scrub.svg index 3e0d18522..7e0143e5b 100644 --- a/navit/textures/scrub.svg +++ b/navit/textures/scrub.svg @@ -46,7 +46,18 @@ <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> <dc:title></dc:title> + <cc:license + rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" /> </cc:Work> + <cc:License + rdf:about="http://creativecommons.org/publicdomain/zero/1.0/"> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Reproduction" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Distribution" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /> + </cc:License> </rdf:RDF> </metadata> <g diff --git a/navit/textures/wetland.svg b/navit/textures/wetland.svg index 2c84b04f1..05ea07cb9 100644 --- a/navit/textures/wetland.svg +++ b/navit/textures/wetland.svg @@ -22,7 +22,18 @@ <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> <dc:title></dc:title> + <cc:license + rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" /> </cc:Work> + <cc:License + rdf:about="http://creativecommons.org/publicdomain/zero/1.0/"> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Reproduction" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Distribution" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /> + </cc:License> </rdf:RDF> </metadata> <defs diff --git a/navit/textures/wood.svg b/navit/textures/wood.svg index a6f8f7d39..1b5f40d66 100644 --- a/navit/textures/wood.svg +++ b/navit/textures/wood.svg @@ -42,7 +42,18 @@ <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> <dc:title></dc:title> + <cc:license + rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" /> </cc:Work> + <cc:License + rdf:about="http://creativecommons.org/publicdomain/zero/1.0/"> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Reproduction" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Distribution" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /> + </cc:License> </rdf:RDF> </metadata> <defs |
