Commit b1063a01 authored by Romain Naour's avatar Romain Naour Committed by Thomas Petazzoni
Browse files

package/openpowerlink: bump to v2.2.2 

From [1]:
With version 2.0, the source code has been cleanly split into
an application-oriented user library and a time-critical stack
driver. The latter may be moved to a dedicated communication
processor or into a kernel module to deliver enhanced
performance while still keeping the API in user space.

This new version break the API used in the v1.x but
this is a complete rewrite of the Powerlink EPSG DS 301
implementation. The v1.x is deprecated anyway.

The new build system has been split in several CMake projects
which makes it difficult to package with the Buildroot CMake
infra. So add a top level CMakeLists.txt to build each
openpowerlink component without having to package each of them
in a separate Buildroot packages. Also we need to fix the
build system to support the top level CMake build.

[1] http://sourceforge.net/projects/openpowerlink/



Signed-off-by: default avatarRomain Naour <romain.naour@gmail.com>

[Thomas:
 - rename patches to not contain the [FIX] part in their title.
 - rewrap Config.in help text
 - rename "openPOWERLINK stack type" to "stack type"
 - rename ""openpowerlink demos" to "demos"]

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 056c9d28

Config.in.legacy

+24 −0
Original line number Diff line number Diff line
@@ -145,6 +145,30 @@ endif 
###############################################################################

comment "Legacy options removed in 2016.02"



config BR2_PACKAGE_OPENPOWERLINK_DEBUG_LEVEL

	bool "openpowerlink debug option has been removed"

	select BR2_LEGACY

	help

	  This option depends on BR2_ENABLE_DEBUG which should not be used

	  by packages anymore.



config BR2_PACKAGE_OPENPOWERLINK_KERNEL_MODULE

	bool "openpowerlink package has been updated"

	select BR2_LEGACY

	select BR2_PACKAGE_OPENPOWERLINK_STACK_KERNEL_STACK_LIB

	help

	  openpowerlink kernel modules are built if the

	  kernel stack library is selected.



config BR2_PACKAGE_OPENPOWERLINK_LIBPCAP

	bool "openpowerlink package has been updated"

	select BR2_LEGACY

	select BR2_PACKAGE_OPENPOWERLINK_STACK_USERSPACE_DAEMON_LIB

	help

	  The user space support has been split in two part:

	  - a monolitic user space library

	  - a user spae deamon driver



config BR2_LINUX_KERNEL_SAME_AS_HEADERS

	bool "using the linux headers version for the kernel has been removed"

	select BR2_LEGACY

package/openpowerlink/0001-fix-use-a-better-regex-for-cmake-system-processor.patch

deleted100644 → 0
+0 −89
Original line number Diff line number Diff line 
From 9fd3aef2f9bb7a2b05b6823281bb5c988fa25149 Mon Sep 17 00:00:00 2001

From: Romain Naour <romain.naour@openwide.fr>

Date: Mon, 17 Nov 2014 23:27:05 +0100

Subject: [PATCH 1/2] [FIX] use a better regex for CMAKE_SYSTEM_PROCESSOR



According to CMake doc, CMAKE_SYSTEM_PROCESSOR is set to the

output of the command "uname -p" (in fact it is the output of "uname

-m"). This is only true for native compilation.



In the case of cross-compilation, the CMake code does not set anything,

it just expects the CMAKE_SYSTEM_* variables to be set in the

toolchain file.



Add a test matching the patern "^i.86$" and keep the old one "x86" for

compatibility.

By doing that, factorize this test using "^(i.86|x86(_64)?)$".



Thanks to Samuel Martin [1]

[1] http://lists.busybox.net/pipermail/buildroot/2014-November/112163.html



Signed-off-by: Romain Naour <romain.naour@openwide.fr>

---

 Examples/X86/Linux/gnu/demo_kernel/CMakeLists.txt         | 15 ++++-----------

 .../X86/Linux/gnu/powerlink_kernel_module/CMakeLists.txt  | 15 ++++-----------

 2 files changed, 8 insertions(+), 22 deletions(-)



diff --git a/Examples/X86/Linux/gnu/demo_kernel/CMakeLists.txt b/Examples/X86/Linux/gnu/demo_kernel/CMakeLists.txt

index 271ecdc..b49ef53 100644

--- a/Examples/X86/Linux/gnu/demo_kernel/CMakeLists.txt

+++ b/Examples/X86/Linux/gnu/demo_kernel/CMakeLists.txt

@@ -154,21 +154,14 @@ SET(MODULE_SOURCE_FILES

     ${POWERLINK_SOURCE_DIR}/ObjDicts/${OBJDICT}/Objdict.c

 )

 

-IF (CMAKE_SYSTEM_PROCESSOR STREQUAL x86)

+IF (CMAKE_SYSTEM_PROCESSOR MATCHES "^(i.86|x86(_64)?)$")

     SET(MODULE_SOURCE_FILES ${MODULE_SOURCE_FILES} ${POWERLINK_SOURCE_DIR}/EplStack/amix86.c)

-

-ELSEIF (   CMAKE_SYSTEM_PROCESSOR STREQUAL arm

-        OR CMAKE_SYSTEM_PROCESSOR STREQUAL armv7l)

+ELSEIF (CMAKE_SYSTEM_PROCESSOR STREQUAL "arm" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7l")

     SET(MODULE_SOURCE_FILES ${MODULE_SOURCE_FILES} ${POWERLINK_SOURCE_DIR}/EplStack/amiarm.c)

-

-ELSEIF (   CMAKE_SYSTEM_PROCESSOR STREQUAL i686

-    OR CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64)

-    SET(MODULE_SOURCE_FILES ${MODULE_SOURCE_FILES} ${POWERLINK_SOURCE_DIR}/EplStack/amix86.c)

-

-ELSE (CMAKE_SYSTEM_PROCESSOR STREQUAL x86)

+ELSE (CMAKE_SYSTEM_PROCESSOR MATCHES "^(i.86|x86(_64)?)$")

     MESSAGE(FATAL_ERROR

             "ami: CMAKE_SYSTEM_PROCESSOR is set to ${CMAKE_SYSTEM_PROCESSOR}. Valid targets are (x86, x86_64, arm, armv7l, i686).")

-ENDIF (CMAKE_SYSTEM_PROCESSOR STREQUAL x86)

+ENDIF (CMAKE_SYSTEM_PROCESSOR MATCHES "^(i.86|x86(_64)?)$")

 

 SET(MODULE_FILE

     ${MODULE_NAME}.ko

diff --git a/Examples/X86/Linux/gnu/powerlink_kernel_module/CMakeLists.txt b/Examples/X86/Linux/gnu/powerlink_kernel_module/CMakeLists.txt

index 1b47c76..f534a4d 100644

--- a/Examples/X86/Linux/gnu/powerlink_kernel_module/CMakeLists.txt

+++ b/Examples/X86/Linux/gnu/powerlink_kernel_module/CMakeLists.txt

@@ -171,21 +171,14 @@ ELSE(CFG_POWERLINK_EDRV STREQUAL "I210")

     SET(MODULE_SOURCE_FILES ${MODULE_SOURCE_FILES} ${POWERLINK_SOURCE_DIR}/Target/X86/Linux/gnu/generic/TimerHighReskX86.c)

 ENDIF(CFG_POWERLINK_EDRV STREQUAL "I210")

 

-IF (CMAKE_SYSTEM_PROCESSOR STREQUAL x86)

+IF (CMAKE_SYSTEM_PROCESSOR MATCHES "^(i.86|x86(_64)?)$")

     SET(MODULE_SOURCE_FILES ${MODULE_SOURCE_FILES} ${POWERLINK_SOURCE_DIR}/EplStack/amix86.c)

-

-ELSEIF (   CMAKE_SYSTEM_PROCESSOR STREQUAL arm

-        OR CMAKE_SYSTEM_PROCESSOR STREQUAL armv7l)

+ELSEIF (CMAKE_SYSTEM_PROCESSOR STREQUAL "arm" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "armv7l")

     SET(MODULE_SOURCE_FILES ${MODULE_SOURCE_FILES} ${POWERLINK_SOURCE_DIR}/EplStack/amiarm.c)

-

-ELSEIF (   CMAKE_SYSTEM_PROCESSOR STREQUAL i686

-	OR CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64)

-    SET(MODULE_SOURCE_FILES ${MODULE_SOURCE_FILES} ${POWERLINK_SOURCE_DIR}/EplStack/amix86.c)

-

-ELSE (CMAKE_SYSTEM_PROCESSOR STREQUAL x86)

+ELSE (CMAKE_SYSTEM_PROCESSOR MATCHES "^(i.86|x86(_64)?)$")

     MESSAGE(FATAL_ERROR

             "ami: CMAKE_SYSTEM_PROCESSOR is set to ${CMAKE_SYSTEM_PROCESSOR}. Valid targets are (x86, x86_64, arm, armv7l, i686).")

-ENDIF (CMAKE_SYSTEM_PROCESSOR STREQUAL x86)

+ENDIF (CMAKE_SYSTEM_PROCESSOR MATCHES "^(i.86|x86(_64)?)$")

 

 SET(MODULE_FILE

     ${MODULE_NAME}.ko

-- 

1.9.3

package/openpowerlink/0001-install-the-stack-libraries-to-lib-subdirectory.patch

0 → 100644
+133 −0
Original line number Diff line number Diff line 
From ebc5aeff65aeda610d9e23ecf4b26b79f9305a0e Mon Sep 17 00:00:00 2001

From: Romain Naour <romain.naour@openwide.fr>

Date: Fri, 1 May 2015 12:19:34 +0200

Subject: [PATCH] install the stack libraries to "lib" subdirectory



Using '.' to install the stack libraries is not correct since

it will install them to /usr/.



ls /usr/liboplkmnapp-kernelintf.so



Fix this by using 'lib' instead of '.'



The problem with the openpowerlink build system is that it expect

the stack directory to be a "local staging" directory which

contains headers and libraries. So the libraries build by the

stack project are installed in stack/lib by default.



This is wrong to do that because it becomes difficult to package

openpowerlink for normal Linux systems.



Buildroot like others build system expect from a packaged software

to install libraries and headers build/provided in a staging

directory.



It seems that CMAKE_INSTALL_PREFIX is misused by the default value

"${CMAKE_CURRENT_SOURCE_DIR}/lib/${SYSTEM_NAME_DIR}/${SYSTEM_PROCESSOR_DIR}"

since it already contains the lib directory and therefore the

entire build system is messed up.



It seems that the openpowerlink's build system doesn't allow/support

CMAKE_INSTALL_PREFIX to be set externally

(which is the standard approach).



The issue has been reported [1] upstream and a build system

refactoring is needed to fix this properly.



[1] http://sourceforge.net/p/openpowerlink/discussion/newbie/thread/3f13af65/#8f80/a50a/4649/f07c



Signed-off-by: Romain Naour <romain.naour@openwide.fr>

---

 stack/proj/linux/liboplkcn/CMakeLists.txt               | 2 +-

 stack/proj/linux/liboplkcnapp-kernelintf/CMakeLists.txt | 2 +-

 stack/proj/linux/liboplkcnapp-userintf/CMakeLists.txt   | 2 +-

 stack/proj/linux/liboplkcndrv-pcap/CMakeLists.txt       | 2 +-

 stack/proj/linux/liboplkmn/CMakeLists.txt               | 2 +-

 stack/proj/linux/liboplkmnapp-kernelintf/CMakeLists.txt | 2 +-

 stack/proj/linux/liboplkmnapp-userintf/CMakeLists.txt   | 2 +-

 stack/proj/linux/liboplkmndrv-pcap/CMakeLists.txt       | 2 +-

 8 files changed, 8 insertions(+), 8 deletions(-)



diff --git a/stack/proj/linux/liboplkcn/CMakeLists.txt b/stack/proj/linux/liboplkcn/CMakeLists.txt

index b7c73e6..23e3112 100644

--- a/stack/proj/linux/liboplkcn/CMakeLists.txt

+++ b/stack/proj/linux/liboplkcn/CMakeLists.txt

@@ -88,4 +88,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES})

 TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES})

 SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL})

 SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d")

-INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .)

+INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib)

diff --git a/stack/proj/linux/liboplkcnapp-kernelintf/CMakeLists.txt b/stack/proj/linux/liboplkcnapp-kernelintf/CMakeLists.txt

index 6c3bec6..a6f9271 100644

--- a/stack/proj/linux/liboplkcnapp-kernelintf/CMakeLists.txt

+++ b/stack/proj/linux/liboplkcnapp-kernelintf/CMakeLists.txt

@@ -81,4 +81,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES})

 TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES})

 SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL})

 SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d")

-INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .)

+INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib)

diff --git a/stack/proj/linux/liboplkcnapp-userintf/CMakeLists.txt b/stack/proj/linux/liboplkcnapp-userintf/CMakeLists.txt

index fdf6fd4..6df8bb7 100644

--- a/stack/proj/linux/liboplkcnapp-userintf/CMakeLists.txt

+++ b/stack/proj/linux/liboplkcnapp-userintf/CMakeLists.txt

@@ -81,4 +81,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES})

 TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES})

 SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL})

 SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d")

-INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .)

+INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib)

diff --git a/stack/proj/linux/liboplkcndrv-pcap/CMakeLists.txt b/stack/proj/linux/liboplkcndrv-pcap/CMakeLists.txt

index 440f02c..6ffcbe9 100644

--- a/stack/proj/linux/liboplkcndrv-pcap/CMakeLists.txt

+++ b/stack/proj/linux/liboplkcndrv-pcap/CMakeLists.txt

@@ -77,4 +77,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES})

 TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES})

 SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL})

 SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d")

-INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .)

+INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib)

diff --git a/stack/proj/linux/liboplkmn/CMakeLists.txt b/stack/proj/linux/liboplkmn/CMakeLists.txt

index 8f97144..e29f795 100644

--- a/stack/proj/linux/liboplkmn/CMakeLists.txt

+++ b/stack/proj/linux/liboplkmn/CMakeLists.txt

@@ -92,4 +92,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES})

 TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES})

 SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL})

 SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d")

-INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .)

+INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib)

diff --git a/stack/proj/linux/liboplkmnapp-kernelintf/CMakeLists.txt b/stack/proj/linux/liboplkmnapp-kernelintf/CMakeLists.txt

index df74265..2ba1cd1 100644

--- a/stack/proj/linux/liboplkmnapp-kernelintf/CMakeLists.txt

+++ b/stack/proj/linux/liboplkmnapp-kernelintf/CMakeLists.txt

@@ -85,4 +85,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES})

 TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES})

 SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL})

 SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d")

-INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .)

+INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib)

diff --git a/stack/proj/linux/liboplkmnapp-userintf/CMakeLists.txt b/stack/proj/linux/liboplkmnapp-userintf/CMakeLists.txt

index 98835c7..12b3dc6 100644

--- a/stack/proj/linux/liboplkmnapp-userintf/CMakeLists.txt

+++ b/stack/proj/linux/liboplkmnapp-userintf/CMakeLists.txt

@@ -85,4 +85,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES})

 TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES})

 SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL})

 SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d")

-INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .)

+INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib)

diff --git a/stack/proj/linux/liboplkmndrv-pcap/CMakeLists.txt b/stack/proj/linux/liboplkmndrv-pcap/CMakeLists.txt

index b4dd41b..cf875ca 100644

--- a/stack/proj/linux/liboplkmndrv-pcap/CMakeLists.txt

+++ b/stack/proj/linux/liboplkmndrv-pcap/CMakeLists.txt

@@ -80,4 +80,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES})

 TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES})

 SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL})

 SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d")

-INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .)

+INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib)

-- 

2.4.3

package/openpowerlink/0002-cmake-install-oplk-headers-files.patch

0 → 100644
+32 −0
Original line number Diff line number Diff line 
From c904fb6ce3c29e77d51d8bcbbbdd48b8d22c754b Mon Sep 17 00:00:00 2001

From: Romain Naour <romain.naour@openwide.fr>

Date: Mon, 4 May 2015 11:47:05 +0200

Subject: [PATCH] cmake: install oplk headers files



In order to be able to link a third party application

with openpowerlink libraries, we need to install the

oplk headers files related to openpowerlink stack.



Install all headers file from STACK_INCLUDE_DIR/oplk.



Signed-off-by: Romain Naour <romain.naour@openwide.fr>

---

 stack/CMakeLists.txt | 5 +++++

 1 file changed, 5 insertions(+)



diff --git a/stack/CMakeLists.txt b/stack/CMakeLists.txt

index 9ff13f4..f4614cd 100644

--- a/stack/CMakeLists.txt

+++ b/stack/CMakeLists.txt

@@ -103,3 +103,8 @@ ELSEIF((CMAKE_SYSTEM_NAME STREQUAL "Generic") AND (CMAKE_SYSTEM_PROCESSOR STREQU

 ELSE()

     MESSAGE(FATAL_ERROR "Unknown Platform and processor combination ${CMAKE_SYSTEM_NAME} and ${CMAKE_SYSTEM_PROCESSOR}!!")

 ENDIF()

+

+################################################################################

+# Install oplk headers files

+################################################################################

+INSTALL(DIRECTORY ${STACK_INCLUDE_DIR}/oplk DESTINATION "include")

-- 

2.4.3

package/openpowerlink/0002-fix-user-space-stack-enable-shared-build.patch

deleted100644 → 0
+0 −54
Original line number Diff line number Diff line 
From 9c11eef037dc1137ab7a4656e45afde7d1a615c4 Mon Sep 17 00:00:00 2001

From: Romain Naour <romain.naour@openwide.fr>

Date: Sat, 22 Nov 2014 16:38:01 +0100

Subject: [PATCH 2/2] [FIX]: user space stack: enable dynamic build



The build fail if BUILD_SHARED_LIBS is set to ON.



Depending on BUILD_SHARED_LIBS, link with STATIC or SHARED.



Signed-off-by: Romain Naour <romain.naour@openwide.fr>

---

 Examples/X86/Generic/powerlink_user_lib/CMakeLists.txt | 12 +++++++++---

 1 file changed, 9 insertions(+), 3 deletions(-)



diff --git a/Examples/X86/Generic/powerlink_user_lib/CMakeLists.txt b/Examples/X86/Generic/powerlink_user_lib/CMakeLists.txt

index 40b7756..27360f2 100644

--- a/Examples/X86/Generic/powerlink_user_lib/CMakeLists.txt

+++ b/Examples/X86/Generic/powerlink_user_lib/CMakeLists.txt

@@ -93,7 +93,13 @@ ENDIF(CFG_STORE_RESTORE)

 #

 # Set type of library

 #

-IF (WIN32)

+IF (UNIX)

+    IF (BUILD_SHARED_LIBS)

+        SET(LIB_TYPE "SHARED")

+    ELSE (BUILD_SHARED_LIBS)

+        SET(LIB_TYPE "STATIC")

+    ENDIF(BUILD_SHARED_LIBS)

+ELSEIF (WIN32)

     IF(CFG_X86_WINDOWS_DLL)

         SET(LIB_TYPE "SHARED")

     ELSE(CFG_X86_WINDOWS_DLL)

@@ -313,7 +319,7 @@ ENDIF ()

 # Define library source code

 #

 IF (UNIX)

-    ADD_LIBRARY(powerlink ${LIB_SOURCES} ${LIB_SOURCES_KERNEL} ${LIB_SOURCES_USER} ${LIB_HEADERS} ${LIB_HEADERS_KERNEL} ${LIB_HEADERS_USER} ${LIB_OBJDICT})

+    ADD_LIBRARY(powerlink ${LIB_TYPE} ${LIB_SOURCES} ${LIB_SOURCES_KERNEL} ${LIB_SOURCES_USER} ${LIB_HEADERS} ${LIB_HEADERS_KERNEL} ${LIB_HEADERS_USER} ${LIB_OBJDICT})

 

     SET_PROPERTY(TARGET powerlink

                  PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL})

@@ -330,7 +336,7 @@ ENDIF ()

 # Installation

 #

 IF (UNIX)

-    INSTALL(TARGETS powerlink ARCHIVE DESTINATION lib)

+    INSTALL(TARGETS powerlink ARCHIVE DESTINATION lib LIBRARY DESTINATION lib COMPONENT library)

 ELSEIF (WIN32)

     IF (CFG_X86_WINDOWS_DLL)

         INSTALL(TARGETS openPOWERLINK RUNTIME DESTINATION bin)

-- 

1.9.3