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