aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Aillet <jonathan.aillet@iot.bzh>2018-06-05 18:22:37 +0200
committerJonathan Aillet <jonathan.aillet@iot.bzh>2018-06-05 18:22:37 +0200
commitacfda0a2236ca70b18ad2e7a6ec1ef3192405aac (patch)
tree594f563e2afa3aa65713806d4e72192f26a7f942
parent37578be0a1514b787f47f503aabc6df209cbda55 (diff)
Move cmake install prefixhal-rc1-sandbox
Move cmake install prefix from config.cmake to distrib osconfig.cmake. Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
-rw-r--r--conf.d/cmake/00-opensuse-osconfig.cmake1
-rw-r--r--conf.d/cmake/config.cmake2
2 files changed, 2 insertions, 1 deletions
diff --git a/conf.d/cmake/00-opensuse-osconfig.cmake b/conf.d/cmake/00-opensuse-osconfig.cmake
index 9f8ce3d..45e6495 100644
--- a/conf.d/cmake/00-opensuse-osconfig.cmake
+++ b/conf.d/cmake/00-opensuse-osconfig.cmake
@@ -1,2 +1,3 @@
message(STATUS "*** Notice: OpenSuSe LUA-5.3+DynApi")
list(APPEND PKG_REQUIRED_LIST lua>=5.3)
+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 1cef680..c4ef3e4 100644
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -81,7 +81,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
# -----------------------------