mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-26 07:37:14 +00:00
Zahir Hussain
33822593e5
Modify the CMakeLists.txt to add an Option for STATIC target import, as available for shared library. Link: https://github.com/facebook/rocksdb/pull/12890 Configure static library as option, default to ON. Provides option to make it off thru PACKCONFIG, if needed. Signed-off-by: Bhabu Bindu <bindu.bhabu@kpit.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> (cherry picked from commit233079a41c) Signed-off-by: Armin Kuster <akuster808@gmail.com> (cherry picked from commit72018ca1b1) Signed-off-by: Zahir Hussain <zahir.basha@kpit.com> Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
73 lines
2.4 KiB
Diff
73 lines
2.4 KiB
Diff
From 285d306494bde3e9c24c8cd6fea1eb380a304d03 Mon Sep 17 00:00:00 2001
|
|
From: Bindu-Bhabu <bindudaniel1996@gmail.com>
|
|
Date: Fri, 26 Jul 2024 15:14:45 +0530
|
|
Subject: Add option to CMake for building static libraries
|
|
|
|
ROCKSDB creates a STATIC library target reference by default.
|
|
Modify the cmake so that the STATIC library is also an option
|
|
just like creating a SHARED library and set default to ON.
|
|
refersh the patch according to kirkstone version.
|
|
|
|
Upstream-Status: Submitted [https://github.com/facebook/rocksdb/pull/12890]
|
|
|
|
Signed-off-by: Nisha Parrakat <nisha.m.parrakat@bmw.de>
|
|
Signed-off-by: Bindu Bhabu <bhabu.bindu@kpit.com>
|
|
Signed-off-by: Zahir Hussain <zahir.basha@kpit.com>
|
|
---
|
|
CMakeLists.txt | 25 +++++++++++++++----------
|
|
1 file changed, 15 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index b68a82b..6f0de6f 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -919,6 +919,7 @@ set(ROCKSDB_STATIC_LIB rocksdb${ARTIFACT_SUFFIX})
|
|
set(ROCKSDB_SHARED_LIB rocksdb-shared${ARTIFACT_SUFFIX})
|
|
|
|
option(ROCKSDB_BUILD_SHARED "Build shared versions of the RocksDB libraries" ON)
|
|
+option(ROCKSDB_BUILD_STATIC "Build static versions of the RocksDB libraries" ON)
|
|
|
|
option(WITH_LIBRADOS "Build with librados" OFF)
|
|
if(WITH_LIBRADOS)
|
|
@@ -938,9 +939,11 @@ else()
|
|
endif()
|
|
endif()
|
|
|
|
-add_library(${ROCKSDB_STATIC_LIB} STATIC ${SOURCES} ${BUILD_VERSION_CC})
|
|
-target_link_libraries(${ROCKSDB_STATIC_LIB} PRIVATE
|
|
- ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
|
|
+if(ROCKSDB_BUILD_STATIC)
|
|
+ add_library(${ROCKSDB_STATIC_LIB} STATIC ${SOURCES} ${BUILD_VERSION_CC})
|
|
+ target_link_libraries(${ROCKSDB_STATIC_LIB} PRIVATE
|
|
+ ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
|
|
+endif()
|
|
|
|
if(ROCKSDB_BUILD_SHARED)
|
|
add_library(${ROCKSDB_SHARED_LIB} SHARED ${SOURCES} ${BUILD_VERSION_CC})
|
|
@@ -1021,13 +1024,15 @@ if(NOT WIN32 OR ROCKSDB_INSTALL_ON_WINDOWS)
|
|
|
|
install(DIRECTORY "${PROJECT_SOURCE_DIR}/cmake/modules" COMPONENT devel DESTINATION ${package_config_destination})
|
|
|
|
- install(
|
|
- TARGETS ${ROCKSDB_STATIC_LIB}
|
|
- EXPORT RocksDBTargets
|
|
- COMPONENT devel
|
|
- ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
|
|
- INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
|
|
- )
|
|
+ if(ROCKSDB_BUILD_STATIC)
|
|
+ install(
|
|
+ TARGETS ${ROCKSDB_STATIC_LIB}
|
|
+ EXPORT RocksDBTargets
|
|
+ COMPONENT devel
|
|
+ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
|
|
+ INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
|
|
+ )
|
|
+ endif()
|
|
|
|
if(ROCKSDB_BUILD_SHARED)
|
|
install(
|
|
--
|
|
2.34.1
|
|
|