summaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorBryce Harrington <bryce@bryceharrington.org>2016-01-16 07:54:47 +0000
committerbryce <bryce@bryceharrington.org>2016-01-16 07:54:47 +0000
commite00e4acb1228491d7aebd45779e7337c2fab9cc7 (patch)
tree00d72e6c4bf28c001d5734ef15502c9c17485fd0 /CMakeLists.txt
parentcmake: Don't check for cmake_policy (diff)
downloadinkscape-e00e4acb1228491d7aebd45779e7337c2fab9cc7.tar.gz
inkscape-e00e4acb1228491d7aebd45779e7337c2fab9cc7.zip
cmake: Move join() to helper functions module
(bzr r14588)
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt16
1 files changed, 2 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cc5dbfe13..62e976852 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,6 +29,8 @@ if(CMAKE_COMPILER_IS_GNUCC)
endif()
endif()
+include(CMakeScripts/HelperFunctions.cmake)
+
#
# Set platform defaults (originally copied from darktable)
#
@@ -47,7 +49,6 @@ if(APPLE)
endif()
# detect current GTK+ backend
- include(${CMAKE_SOURCE_DIR}/CMakeScripts/HelperFunctions.cmake)
pkg_check_variable(gtk+-2.0 target)
message("GTK2 backend: ${GTK+_2.0_TARGET}")
@@ -196,19 +197,6 @@ macro(pod2man PODFILE_FULL RELEASE SECTION CENTER)
endif()
endmacro(pod2man PODFILE NAME SECTION CENTER)
-function(JOIN OUTPUT GLUE)
- set(_TMP_RESULT "")
- set(_GLUE "") # effective glue is empty at the beginning
- foreach(arg ${ARGN})
- # Skip empty lines
- if(NOT arg STREQUAL "\n")
- set(_TMP_RESULT "${_TMP_RESULT}${_GLUE}${arg}")
- set(_GLUE "${GLUE}")
- endif()
- endforeach()
- set(${OUTPUT} "${_TMP_RESULT}" PARENT_SCOPE)
-endfunction()
-
# Load AUTHORS file contents into $INKSCAPE_AUTHORS
FILE(READ ${CMAKE_CURRENT_SOURCE_DIR}/AUTHORS content)
STRING(REGEX REPLACE "^([^\n#]+)\n" "\\1;\n" content_list "${content}")