mirror of
https://github.com/conan-io/conan-center-index.git
synced 2025-05-10 04:20:47 +00:00
615533f4a8
* mysql-connector-cpp: new recipe * Added mysqlcppconn recipe * mysql-connector-cpp: fix build * mysql-connector-cpp: drop example.cpp * mysql-connector-cpp: fix shared build * mysql-connector-cpp: use GLOBAL on find_package() * mysql-connector-cpp: require CMake 3.24+ for GLOBAL * mysql-connector-cpp: workaound for macOS cross-compilation * mysql-connector-cpp: another try at macOS cross-compilation * mysql-connector-cpp: disable bootstrap() in CMakeLists.txt * mysql-connector-cpp: replace fragile merge_libraries() with object libs * mysql-connector-cpp: drop target_include_dirs patch No longer needed after removing bootstrap(). * mysql-connector-cpp: apply review suggestions Co-authored-by: PerseoGI <perseog@jfrog.com> * mysql-connector-cpp: drop override-cmake-policy-version.patch * mysql-connector-cpp: add dl to system_libs * mysql-connector-cpp: tidy system_libs * Updated recipe to be conan2 compliant * Updated to v9.2.0, simplified patches and recipe --------- Co-authored-by: Hussein Itawi <26905155+husitawi@users.noreply.github.com> Co-authored-by: PerseoGI <perseog@jfrog.com>
42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
diff --git a/cmake/libutils.cmake b/cmake/libutils.cmake
|
|
index 848b7cf..cb748e6 100644
|
|
--- a/cmake/libutils.cmake
|
|
+++ b/cmake/libutils.cmake
|
|
@@ -164,6 +164,9 @@ function(merge_libraries TARGET)
|
|
set_property(SOURCE "${LIBUTILS_SCRIPT_DIR}/empty.cc" PROPERTY LANGUAGE CXX)
|
|
|
|
add_library(${TARGET} ${TYPE} "${LIBUTILS_SCRIPT_DIR}/empty.cc")
|
|
+ if(BUILD_STATIC AND DEFINED _CONAN_CMAKE_STATIC_LIBRARY_PREFIX_ORIG)
|
|
+ set_target_properties(${TARGET} PROPERTIES PREFIX "${_CONAN_CMAKE_STATIC_LIBRARY_PREFIX_ORIG}")
|
|
+ endif()
|
|
target_link_libraries(${TARGET} PRIVATE ${ARGN})
|
|
|
|
#
|
|
@@ -278,7 +281,8 @@ function(merge_libraries TARGET)
|
|
#
|
|
|
|
foreach(lib ${ARGN})
|
|
- if(CLANG)
|
|
+ if(1)
|
|
+ message("Will link target ${lib} into shared library with /wholearchive option")
|
|
target_link_options(${TARGET} PRIVATE /wholearchive:$<TARGET_FILE:${lib}>)
|
|
else()
|
|
target_link_options(${TARGET} PRIVATE /wholearchive:${lib})
|
|
diff --git a/cmake/libutils/merge_archives.cmake.in b/cmake/libutils/merge_archives.cmake.in
|
|
index 33094a6..506705a 100644
|
|
--- a/cmake/libutils/merge_archives.cmake.in
|
|
+++ b/cmake/libutils/merge_archives.cmake.in
|
|
@@ -570,9 +570,9 @@ function(process_deps)
|
|
AND NOT lib MATCHES "${NAME}${libext}$"
|
|
AND EXISTS "${libpath}"
|
|
)
|
|
- if(lib MATCHES "protobuf|uuid_gen|libssl|libcrypto|mysqlclient")
|
|
+ if(0)
|
|
list(APPEND LIBS1 "${lib}")
|
|
- else()
|
|
+ elseif(lib MATCHES concpp_internal)
|
|
list(APPEND LIBS "${lib}")
|
|
endif()
|
|
endif()
|
|
|