summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2016-06-05 22:28:30 +0000
committerTed Gould <ted@gould.cx>2016-06-05 22:28:30 +0000
commit973c1766a7ea118fca959c0895bfc52915abdb57 (patch)
treeca3c79bdeb629702a26ae7c4f350efed96476b72
parentInitial build to get the binaries installed, needs more work (diff)
downloadinkscape-973c1766a7ea118fca959c0895bfc52915abdb57.tar.gz
inkscape-973c1766a7ea118fca959c0895bfc52915abdb57.zip
Try binreloc
(bzr r14950.1.2)
-rw-r--r--CMakeLists.txt10
-rw-r--r--snapcraft.yaml1
2 files changed, 11 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a68b678c1..119a0fb7b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -102,6 +102,8 @@ option(WITH_LIBWPG "Compile with support of libwpg for WordPerfect Graphics" ON)
option(WITH_NLS "Compile with Native Language Support (using gettext)" ON)
option(WITH_GTK3_EXPERIMENTAL "Enable compilation with GTK+3 (EXPERIMENTAL!)" OFF)
+option(ENABLE_BINRELOC "Enable relocatable binaries" OFF)
+
include(CMakeScripts/ConfigPaths.cmake) # Installation Paths
include(CMakeScripts/DefineDependsandFlags.cmake) # Includes, Compiler Flags, and Link Libraries
include(CMakeScripts/HelperMacros.cmake) # Misc Utility Macros
@@ -122,6 +124,14 @@ endif()
# -----------------------------------------------------------------------------
# -----------------------------------------------------------------------------
+# Relocatable Binary
+# -----------------------------------------------------------------------------
+
+if (ENABLE_BINRELOC)
+ add_definitions(-DENABLE_BINRELOC)
+endif()
+
+# -----------------------------------------------------------------------------
# Dist Target
# -----------------------------------------------------------------------------
set(INKSCAPE_DIST_PREFIX "${PROJECT_NAME}-${INKSCAPE_VERSION}")
diff --git a/snapcraft.yaml b/snapcraft.yaml
index fc290a80f..99a1ee7af 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -19,6 +19,7 @@ parts:
inkscape:
plugin: cmake
source: .
+ configflags: ['-DENABLE_BINRELOC=ON']
snapcraft-wrapper:
plugin: copy
files: