[oe-commits] [meta-openembedded] 04/43: librcf: install missing SF headers
git at git.openembedded.org
git at git.openembedded.org
Tue Apr 18 12:25:56 UTC 2017
This is an automated email from the git hooks/post-receive script.
martin_jansa pushed a commit to branch master
in repository meta-openembedded.
commit 3405347d58d0a8f8604f4b240733c82f095c8bbe
Author: Ming Liu <peter.x.liu at external.atlascopco.com>
AuthorDate: Fri Apr 7 08:33:43 2017 +0200
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 at external.atlascopco.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
.../librcf/librcf/0001-Add-CMake-build-files.patch | 7 ++++---
1 file 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 34d0f62..cd0d143 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 at 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)
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list