summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-11-16 10:22:43 +0100
committerRomain Forlot <romain.forlot@iot.bzh>2018-10-15 18:22:47 +0200
commit879ef4232238d21bd808eec4abb7b6f59c43bc9c (patch)
tree85670a365cbb266f2a00d8c5d5a6330b84deb38d
parentf043dc5cb9879e455444c8095ece8bc56e7d947e (diff)
Could specify others default install directories
Path to default package BINDIR, LIBDIR, ETCDIR, DATADIR and HTTPDIR. Change-Id: I0e820f48f60e5e18053077fdbaa1d45912d5bb12 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
-rw-r--r--cmake/cmake.d/02-variables.cmake7
-rw-r--r--cmake/cmake.d/03-macros.cmake5
2 files changed, 7 insertions, 5 deletions
diff --git a/cmake/cmake.d/02-variables.cmake b/cmake/cmake.d/02-variables.cmake
index e90ff11..da6753a 100644
--- a/cmake/cmake.d/02-variables.cmake
+++ b/cmake/cmake.d/02-variables.cmake
@@ -144,3 +144,10 @@ set(GDB_INITIAL_BREAK "personality" CACHE STRING "Initial Break Point for GDB re
set(LUA_CHECKER "luac" "-p" CACHE STRING "LUA compiler")
set(XML_CHECKER "xmllint" CACHE STRING "XML linter")
set(JSON_CHECKER "" CACHE STRING "JSON linter")
+
+# Default GNU directories path variables
+set(BINDIR bin CACHE PATH "User executables")
+set(ETCDIR etc CACHE PATH "Read only system configuration data")
+set(LIBDIR lib CACHE PATH "System library directory")
+set(HTTPDIR htdocs CACHE PATH "HTML5 data directory")
+set(DATADIR data CACHE PATH "External data resources files")
diff --git a/cmake/cmake.d/03-macros.cmake b/cmake/cmake.d/03-macros.cmake
index bf297a2..e99208b 100644
--- a/cmake/cmake.d/03-macros.cmake
+++ b/cmake/cmake.d/03-macros.cmake
@@ -269,11 +269,6 @@ endmacro()
# Pre-packaging
macro(project_targets_populate)
# Default Widget default directory
- set(BINDIR bin)
- set(ETCDIR etc)
- set(LIBDIR lib)
- set(HTTPDIR htdocs)
- set(DATADIR data)
set(PACKAGE_BINDIR ${PROJECT_PKG_BUILD_DIR}/${BINDIR})
set(PACKAGE_ETCDIR ${PROJECT_PKG_BUILD_DIR}/${ETCDIR})
set(PACKAGE_LIBDIR ${PROJECT_PKG_BUILD_DIR}/${LIBDIR})