diff options
| author | dimitri staessens <dimitri.staessens@intec.ugent.be> | 2016-06-28 10:26:47 +0200 |
|---|---|---|
| committer | dimitri staessens <dimitri.staessens@intec.ugent.be> | 2016-06-28 10:31:47 +0200 |
| commit | e552ad819aa9ba007464f5dcd6e4aa466f2c4ed9 (patch) | |
| tree | ad06a22d076c3981c8994166d1d9932a37f024d8 | |
| parent | cffd94aae48dac005d820dd667498bbbb09ab117 (diff) | |
| download | ouroboros-e552ad819aa9ba007464f5dcd6e4aa466f2c4ed9.tar.gz ouroboros-e552ad819aa9ba007464f5dcd6e4aa466f2c4ed9.zip | |
build: addresses comments on cffd94a
| -rw-r--r-- | CMakeLists.txt | 12 | ||||
| -rwxr-xr-x | compile_debug.sh | 2 | ||||
| -rwxr-xr-x | compile_release.sh | 2 | ||||
| -rwxr-xr-x | install_debug.sh | 2 | ||||
| -rwxr-xr-x | install_release.sh | 2 | ||||
| -rw-r--r-- | src/ipcpd/normal/CMakeLists.txt | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7b5f5e85..ba900645 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,12 +2,6 @@ cmake_minimum_required(VERSION 2.8.12.2) set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") -LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES - "${CMAKE_INSTALL_PREFIX}/usr/lib" isSystemDir) -IF("${isSystemDir}" STREQUAL "-1") - SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/usr/lib") -ENDIF("${isSystemDir}" STREQUAL "-1") - project(ouroboros C) include(GitVersionGen) @@ -29,6 +23,12 @@ SET(CMAKE_SKIP_BUILD_RPATH FALSE) SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) +LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES + "${CMAKE_INSTALL_PREFIX}/usr/lib" isSystemDir) +IF("${isSystemDir}" STREQUAL "-1") + SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/usr/lib") +ENDIF("${isSystemDir}" STREQUAL "-1") + message(STATUS "Package name is: ${PACKAGE_NAME}") message(STATUS "Package description is: ${PACKAGE_DESCRIPTION}") message(STATUS "Package version is: ${PACKAGE_VERSION}") diff --git a/compile_debug.sh b/compile_debug.sh index 484f1076..3ea1e039 100755 --- a/compile_debug.sh +++ b/compile_debug.sh @@ -6,7 +6,7 @@ if (($# == 1 )) then PREFIX=`echo "$1"|sed -e "s,\/$,,"` else - PREFIX="/usr/local/ouroboros/" + PREFIX="/usr/local/ouroboros" fi BUILDDIR=build diff --git a/compile_release.sh b/compile_release.sh index 0b1c1a96..58a16e52 100755 --- a/compile_release.sh +++ b/compile_release.sh @@ -6,7 +6,7 @@ if (($# == 1 )) then PREFIX=`echo "$1"|sed -e "s,\/$,,"` else - PREFIX="/" + PREFIX="" fi BUILDDIR=build diff --git a/install_debug.sh b/install_debug.sh index 10e50706..ef6b8a30 100755 --- a/install_debug.sh +++ b/install_debug.sh @@ -6,7 +6,7 @@ if (($# == 1 )) then PREFIX=`echo "$1"|sed -e "s,\/$,,"` else - PREFIX="/usr/local/ouroboros/" + PREFIX="/usr/local/ouroboros" fi BUILDDIR=build diff --git a/install_release.sh b/install_release.sh index d2de5526..f5d08bb5 100755 --- a/install_release.sh +++ b/install_release.sh @@ -6,7 +6,7 @@ if (($# == 1 )) then PREFIX=`echo "$1"|sed -e "s,\/$,,"` else - PREFIX="/" + PREFIX="" fi BUILDDIR=build diff --git a/src/ipcpd/normal/CMakeLists.txt b/src/ipcpd/normal/CMakeLists.txt index 5c14c87a..74bd19ec 100644 --- a/src/ipcpd/normal/CMakeLists.txt +++ b/src/ipcpd/normal/CMakeLists.txt @@ -28,7 +28,7 @@ if (CMAKE_BUILD_TYPE MATCHES Debug) MACRO_ADD_COMPILE_FLAGS(ipcpd-normal -DCONFIG_OUROBOROS_DEBUG) endif (CMAKE_BUILD_TYPE MATCHES Debug) -install(TARGETS ipcpd-normal RUNTIME DESTINATION /sbin) +install(TARGETS ipcpd-normal RUNTIME DESTINATION sbin) # Enable once ipcp-normal has tests # add_subdirectory(tests) |