1From 16230b7f51bff2bdf061fa80e9a49c807596bb92 Mon Sep 17 00:00:00 2001 2From: Romain Naour <romain.naour@gmail.com> 3Date: Wed, 25 May 2016 15:57:10 +0200 4Subject: [PATCH] install the stack libraries to "lib" subdirectory 5 6Using '.' to install the stack libraries is not correct since 7it will install them to /usr/. 8 9ls /usr/liboplkmnapp-kernelintf.so 10 11Fix this by using 'lib' instead of '.' 12 13The problem with the openpowerlink build system is that it expect 14the stack directory to be a "local staging" directory which 15contains headers and libraries. So the libraries build by the 16stack project are installed in stack/lib by default. 17 18This is wrong to do that because it becomes difficult to package 19openpowerlink for normal Linux systems. 20 21Buildroot like others build system expect from a packaged software 22to install libraries and headers build/provided in a staging 23directory. 24 25It seems that CMAKE_INSTALL_PREFIX is misused by the default value 26"${CMAKE_CURRENT_SOURCE_DIR}/lib/${SYSTEM_NAME_DIR}/${SYSTEM_PROCESSOR_DIR}" 27since it already contains the lib directory and therefore the 28entire build system is messed up. 29 30It seems that the openpowerlink's build system doesn't allow/support 31CMAKE_INSTALL_PREFIX to be set externally 32(which is the standard approach). 33 34The issue has been reported [1] upstream and a build system 35refactoring is needed to fix this properly. 36 37[1] http://sourceforge.net/p/openpowerlink/discussion/newbie/thread/3f13af65/#8f80/a50a/4649/f07c 38 39[rebase on v2.5.0] 40Signed-off-by: Romain Naour <romain.naour@gmail.com> 41--- 42 stack/proj/linux/liboplkcn-sim/CMakeLists.txt | 2 +- 43 stack/proj/linux/liboplkcn/CMakeLists.txt | 2 +- 44 stack/proj/linux/liboplkcnapp-kernelintf/CMakeLists.txt | 2 +- 45 stack/proj/linux/liboplkcnapp-userintf/CMakeLists.txt | 2 +- 46 stack/proj/linux/liboplkcndrv-pcap/CMakeLists.txt | 2 +- 47 stack/proj/linux/liboplkmn-sim/CMakeLists.txt | 2 +- 48 stack/proj/linux/liboplkmn/CMakeLists.txt | 2 +- 49 stack/proj/linux/liboplkmnapp-kernelintf/CMakeLists.txt | 2 +- 50 stack/proj/linux/liboplkmnapp-kernelpcp/CMakeLists.txt | 2 +- 51 stack/proj/linux/liboplkmnapp-userintf/CMakeLists.txt | 2 +- 52 stack/proj/linux/liboplkmndrv-pcap/CMakeLists.txt | 2 +- 53 11 files changed, 11 insertions(+), 11 deletions(-) 54 55diff --git a/stack/proj/linux/liboplkcn-sim/CMakeLists.txt b/stack/proj/linux/liboplkcn-sim/CMakeLists.txt 56index 2b3da16..ddb3e92 100644 57--- a/stack/proj/linux/liboplkcn-sim/CMakeLists.txt 58+++ b/stack/proj/linux/liboplkcn-sim/CMakeLists.txt 59@@ -96,4 +96,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES}) 60 TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES}) 61 SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL}) 62 SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d") 63-INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .) 64+INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) 65diff --git a/stack/proj/linux/liboplkcn/CMakeLists.txt b/stack/proj/linux/liboplkcn/CMakeLists.txt 66index 3be6c52..cf1b1dd 100644 67--- a/stack/proj/linux/liboplkcn/CMakeLists.txt 68+++ b/stack/proj/linux/liboplkcn/CMakeLists.txt 69@@ -90,4 +90,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES}) 70 TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES}) 71 SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL}) 72 SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d") 73-INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .) 74+INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) 75diff --git a/stack/proj/linux/liboplkcnapp-kernelintf/CMakeLists.txt b/stack/proj/linux/liboplkcnapp-kernelintf/CMakeLists.txt 76index 904de6c..d8713a8 100644 77--- a/stack/proj/linux/liboplkcnapp-kernelintf/CMakeLists.txt 78+++ b/stack/proj/linux/liboplkcnapp-kernelintf/CMakeLists.txt 79@@ -83,4 +83,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES}) 80 TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES}) 81 SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL}) 82 SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d") 83-INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .) 84+INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) 85diff --git a/stack/proj/linux/liboplkcnapp-userintf/CMakeLists.txt b/stack/proj/linux/liboplkcnapp-userintf/CMakeLists.txt 86index e2514cf..a4e2b75 100644 87--- a/stack/proj/linux/liboplkcnapp-userintf/CMakeLists.txt 88+++ b/stack/proj/linux/liboplkcnapp-userintf/CMakeLists.txt 89@@ -83,4 +83,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES}) 90 TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES}) 91 SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL}) 92 SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d") 93-INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .) 94+INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) 95diff --git a/stack/proj/linux/liboplkcndrv-pcap/CMakeLists.txt b/stack/proj/linux/liboplkcndrv-pcap/CMakeLists.txt 96index 98f068c..bb20006 100644 97--- a/stack/proj/linux/liboplkcndrv-pcap/CMakeLists.txt 98+++ b/stack/proj/linux/liboplkcndrv-pcap/CMakeLists.txt 99@@ -76,4 +76,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES}) 100 TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES}) 101 SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL}) 102 SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d") 103-INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .) 104+INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) 105diff --git a/stack/proj/linux/liboplkmn-sim/CMakeLists.txt b/stack/proj/linux/liboplkmn-sim/CMakeLists.txt 106index eb6396a..5beaa07 100644 107--- a/stack/proj/linux/liboplkmn-sim/CMakeLists.txt 108+++ b/stack/proj/linux/liboplkmn-sim/CMakeLists.txt 109@@ -91,4 +91,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES}) 110 TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES}) 111 SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL}) 112 SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d") 113-INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .) 114+INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) 115diff --git a/stack/proj/linux/liboplkmn/CMakeLists.txt b/stack/proj/linux/liboplkmn/CMakeLists.txt 116index cf7927f..6b19557 100644 117--- a/stack/proj/linux/liboplkmn/CMakeLists.txt 118+++ b/stack/proj/linux/liboplkmn/CMakeLists.txt 119@@ -89,4 +89,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES}) 120 TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES}) 121 SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL}) 122 SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d") 123-INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .) 124+INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) 125diff --git a/stack/proj/linux/liboplkmnapp-kernelintf/CMakeLists.txt b/stack/proj/linux/liboplkmnapp-kernelintf/CMakeLists.txt 126index 9daa2df..bfccb25 100644 127--- a/stack/proj/linux/liboplkmnapp-kernelintf/CMakeLists.txt 128+++ b/stack/proj/linux/liboplkmnapp-kernelintf/CMakeLists.txt 129@@ -82,4 +82,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES}) 130 TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES}) 131 SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL}) 132 SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d") 133-INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .) 134+INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) 135diff --git a/stack/proj/linux/liboplkmnapp-kernelpcp/CMakeLists.txt b/stack/proj/linux/liboplkmnapp-kernelpcp/CMakeLists.txt 136index 0135f46..83128eb 100644 137--- a/stack/proj/linux/liboplkmnapp-kernelpcp/CMakeLists.txt 138+++ b/stack/proj/linux/liboplkmnapp-kernelpcp/CMakeLists.txt 139@@ -91,4 +91,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES}) 140 TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES}) 141 SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL}) 142 SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d") 143-INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .) 144+INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) 145diff --git a/stack/proj/linux/liboplkmnapp-userintf/CMakeLists.txt b/stack/proj/linux/liboplkmnapp-userintf/CMakeLists.txt 146index cd97882..aaaa526 100644 147--- a/stack/proj/linux/liboplkmnapp-userintf/CMakeLists.txt 148+++ b/stack/proj/linux/liboplkmnapp-userintf/CMakeLists.txt 149@@ -82,4 +82,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES}) 150 TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES}) 151 SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL}) 152 SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d") 153-INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .) 154+INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) 155diff --git a/stack/proj/linux/liboplkmndrv-pcap/CMakeLists.txt b/stack/proj/linux/liboplkmndrv-pcap/CMakeLists.txt 156index 0c29087..1783134 100644 157--- a/stack/proj/linux/liboplkmndrv-pcap/CMakeLists.txt 158+++ b/stack/proj/linux/liboplkmndrv-pcap/CMakeLists.txt 159@@ -79,4 +79,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES}) 160 TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES}) 161 SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL}) 162 SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d") 163-INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .) 164+INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) 165-- 1662.9.4 167 168