aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Aillet <jonathan.aillet@iot.bzh>2018-06-05 18:26:05 +0200
committerJonathan Aillet <jonathan.aillet@iot.bzh>2018-10-08 15:52:51 +0200
commit3f2dc281da4c54b1b91a4cf865fed21321801bce (patch)
treea8b033c8498b4a9ee3e90d1c35951371d15fd9c8
parentf90ddc883cf7ac1096bb89a320fae272abbb6c3b (diff)
Move cmake install prefix
Move cmake install prefix from config.cmake to distrib osconfig.cmake. Change-Id: I7b5e0b83a5afbfb64ccfba681efa757d2800fda7 Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
-rw-r--r--conf.d/cmake/00-debian-osconfig.cmake1
-rw-r--r--conf.d/cmake/00-default-osconfig.cmake3
-rw-r--r--conf.d/cmake/00-suse-config.cmake1
-rw-r--r--conf.d/cmake/config.cmake2
4 files changed, 5 insertions, 2 deletions
diff --git a/conf.d/cmake/00-debian-osconfig.cmake b/conf.d/cmake/00-debian-osconfig.cmake
index a7e0a0a..64bc678 100644
--- a/conf.d/cmake/00-debian-osconfig.cmake
+++ b/conf.d/cmake/00-debian-osconfig.cmake
@@ -1,2 +1,3 @@
list(APPEND PKG_REQUIRED_LIST lua-5.3>=5.3)
add_compile_options(-DUSE_API_DYN)
+set(CMAKE_INSTALL_PREFIX $ENV{HOME}/opt) \ No newline at end of file
diff --git a/conf.d/cmake/00-default-osconfig.cmake b/conf.d/cmake/00-default-osconfig.cmake
index 7762c85..b353fd7 100644
--- a/conf.d/cmake/00-default-osconfig.cmake
+++ b/conf.d/cmake/00-default-osconfig.cmake
@@ -1,2 +1,3 @@
list(APPEND PKG_REQUIRED_LIST lua>=5.3)
-add_compile_options(-DUSE_API_DYN) \ No newline at end of file
+add_compile_options(-DUSE_API_DYN)
+set(CMAKE_INSTALL_PREFIX $ENV{HOME}/opt) \ No newline at end of file
diff --git a/conf.d/cmake/00-suse-config.cmake b/conf.d/cmake/00-suse-config.cmake
index b8bac32..a08a2d4 100644
--- a/conf.d/cmake/00-suse-config.cmake
+++ b/conf.d/cmake/00-suse-config.cmake
@@ -1,3 +1,4 @@
add_definitions(-DSUSE_LUA_INCDIR)
list(APPEND PKG_REQUIRED_LIST lua>=5.3)
add_compile_options(-DUSE_API_DYN)
+set(CMAKE_INSTALL_PREFIX $ENV{HOME}/opt) \ No newline at end of file
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
index 222d16d..db6d912 100644
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -77,7 +77,7 @@ set (PKG_REQUIRED_LIST
# Prefix path where will be installed the files
# Default: /usr/local (need root permission to write in)
# ------------------------------------------------------
-set(CMAKE_INSTALL_PREFIX $ENV{HOME}/opt)
+#set(CMAKE_INSTALL_PREFIX $ENV{HOME}/opt)
# Customize link option
# -----------------------------