diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2017-07-11 12:06:50 +0200 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2017-07-11 12:18:07 +0200 |
| commit | 92f95384ce4b4a198b1fea93272201421f7b9a39 (patch) | |
| tree | 517edd05f23fbbe3e5cee8666be89be8936a5d11 | |
| parent | 3db13d343c769162e615566d7f2f95b047be57ff (diff) | |
Change default installation directoryeel_5.1.0eel_5.0.3eel_5.0.2eel_5.0.1eel_5.0.0eel_4.99.5eel_4.99.4eel_4.99.3eel_4.99.2eel_4.99.1eel/5.1.0eel/5.0.3eel/5.0.2eel/5.0.1eel/5.0.0eel/4.99.5eel/4.99.4eel/4.99.3eel/4.99.2eel/4.99.15.1.05.0.35.0.25.0.15.0.04.99.54.99.44.99.34.99.24.99.1eel
Change-Id: I78d0f0cfa27a17a5d951610b30b2d1bc8f70212e
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
| -rw-r--r-- | conf.d/config.cmake | 2 | ||||
| -rw-r--r-- | 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}) |