From 3f2dc281da4c54b1b91a4cf865fed21321801bce Mon Sep 17 00:00:00 2001 From: Jonathan Aillet Date: Tue, 5 Jun 2018 18:26:05 +0200 Subject: Move cmake install prefix Move cmake install prefix from config.cmake to distrib osconfig.cmake. Change-Id: I7b5e0b83a5afbfb64ccfba681efa757d2800fda7 Signed-off-by: Jonathan Aillet --- conf.d/cmake/00-debian-osconfig.cmake | 1 + conf.d/cmake/00-default-osconfig.cmake | 3 ++- conf.d/cmake/00-suse-config.cmake | 1 + conf.d/cmake/config.cmake | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) (limited to 'conf.d/cmake') 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 # ----------------------------- -- cgit 1.2.3-korg