From 92f95384ce4b4a198b1fea93272201421f7b9a39 Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Tue, 11 Jul 2017 12:06:50 +0200 Subject: Change default installation directory Change-Id: I78d0f0cfa27a17a5d951610b30b2d1bc8f70212e Signed-off-by: Romain Forlot --- conf.d/config.cmake | 2 +- src/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf.d/config.cmake b/conf.d/config.cmake index 505b5c2..1f50917 100644 --- a/conf.d/config.cmake +++ b/conf.d/config.cmake @@ -68,7 +68,7 @@ set(CLOSING_MESSAGE "Test with: ./src/can-config-generator -m ../tests/basic.jso # (BUG!!!) as PKG_CONFIG_PATH does not work [should be an env variable] # --------------------------------------------------------------------- -set(CMAKE_INSTALL_PREFIX $ENV{HOME}/opt) +# set(CMAKE_INSTALL_PREFIX $ENV{HOME}/opt) set(CMAKE_PREFIX_PATH ${CMAKE_INSTALL_PREFIX}/lib64/pkgconfig ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig) set(LD_LIBRARY_PATH ${CMAKE_INSTALL_PREFIX}/lib64 ${CMAKE_INSTALL_PREFIX}/lib) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3dfab05..f568da1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -41,4 +41,4 @@ PROJECT_TARGET_ADD(can-config-generator) # installation directory INSTALL(TARGETS can-config-generator -RUNTIME DESTINATION /usr/local/bin) + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) -- cgit 1.2.3-korg