diff options
| author |   Ming Liu <peter.x.liu@external.atlascopco.com> | 2017-04-07 08:33:43 +0200 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2017-04-18 14:21:38 +0200 |
| commit | 3405347d58d0a8f8604f4b240733c82f095c8bbe (patch) | |
| tree | 5123b5fea7593f30054bbf7ae71836b7b3474f57 /meta-oe/recipes-devtools | |
| parent | 4175dc4a8b6a5c452133dbc149b0b77b5aed13cb (diff) | |
| download | meta-openembedded-contrib-3405347d58d0a8f8604f4b240733c82f095c8bbe.tar.gz | |
librcf: install missing SF headers
A flaw was introduced by commit 414426a3:
[ librcf: add new recipe ]
in which, the SF headers wasn't installed, this could cause build
errors in projects that compiling/linking to librcf while librcf
was built with LIBRCF_USE_SF_SERIALIZATION option enabled.
Signed-off-by: Ming Liu <peter.x.liu@external.atlascopco.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools')
| -rw-r--r-- | meta-oe/recipes-devtools/librcf/librcf/0001-Add-CMake-build-files.patch | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/meta-oe/recipes-devtools/librcf/librcf/0001-Add-CMake-build-files.patch b/meta-oe/recipes-devtools/librcf/librcf/0001-Add-CMake-build-files.patch index 34d0f623b3..cd0d1433f7 100644 --- a/meta-oe/recipes-devtools/librcf/librcf/0001-Add-CMake-build-files.patch +++ b/meta-oe/recipes-devtools/librcf/librcf/0001-Add-CMake-build-files.patch @@ -10,8 +10,8 @@ Signed-off-by: Peter Liu <peter.x.liu@external.atlascopco.com> CMakeLists.txt | 147 +++++++++++++++++++++++++++++++++++++++++++++++++++++ FindLibRcf.cmake | 63 +++++++++++++++++++++++ VERSION.cmake | 21 ++++++++ - src/CMakeLists.txt | 24 +++++++++ - 4 files changed, 255 insertions(+) + src/CMakeLists.txt | 25 +++++++++ + 4 files changed, 256 insertions(+) create mode 100644 CMakeLists.txt create mode 100644 FindLibRcf.cmake create mode 100644 VERSION.cmake @@ -271,7 +271,7 @@ new file mode 100755 index 0000000..c227901 --- /dev/null +++ b/src/CMakeLists.txt -@@ -0,0 +1,24 @@ +@@ -0,0 +1,25 @@ +IF (NOT LIBRCF_BUILD_SHARED_LIBS) + ADD_LIBRARY (rcf STATIC RCF/RCF.cpp) +ELSE (NOT LIBRCF_BUILD_SHARED_LIBS) @@ -287,6 +287,7 @@ index 0000000..c227901 +SET_TARGET_PROPERTIES (rcf PROPERTIES INSTALL_NAME_DIR ${CMAKE_INSTALL_LIBDIR}) + +INSTALL (DIRECTORY "${CMAKE_SOURCE_DIR}/include/RCF" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) ++INSTALL (DIRECTORY "${CMAKE_SOURCE_DIR}/include/SF" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) +INSTALL (TARGETS rcf LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + +IF (LIBRCF_BUILD_STATIC_LIBS AND LIBRCF_BUILD_SHARED_LIBS) |