mirror of
https://github.com/conan-io/conan-center-index.git
synced 2025-05-09 20:14:06 +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>
26 lines
514 B
Diff
26 lines
514 B
Diff
diff --git a/cdk/cmake/DepFindProtobuf.cmake b/cdk/cmake/DepFindProtobuf.cmake
|
|
index 1fc785e..41d1405 100644
|
|
--- a/cdk/cmake/DepFindProtobuf.cmake
|
|
+++ b/cdk/cmake/DepFindProtobuf.cmake
|
|
@@ -44,6 +44,7 @@
|
|
#
|
|
#
|
|
|
|
+if(0)
|
|
if(TARGET ext::protobuf)
|
|
return()
|
|
endif()
|
|
@@ -64,6 +65,11 @@ add_ext_targets(protobuf
|
|
LIBRARY protobuf pb_libprotobuf
|
|
EXECUTABLE protoc pb_protoc
|
|
)
|
|
+endif()
|
|
+
|
|
+if (COMMAND mysqlx_protobuf_generate_cpp)
|
|
+ return()
|
|
+endif()
|
|
|
|
|
|
# Standard PROTOBUF_GENERATE_CPP modified to our usage
|
|
|