diff options
| author | Mario Emmenlauer <mario@emmenlauer.de> | 2022-09-12 06:26:47 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-12 06:26:47 -0700 |
| commit | dba7c43262819cec69502e281319e5aa7458efca (patch) | |
| tree | ed79471bf8ff41fddb90f37d83b203738c624c86 /lib | |
| parent | b17672ac38cbc9347e1331798f4e6bc91502fdd2 (diff) | |
| parent | fe73972ba61ca2c5fd7ebe3df1fb2aa285a09a9c (diff) | |
| download | thrift-dba7c43262819cec69502e281319e5aa7458efca.tar.gz | |
Merge pull request #2644 from lorteddie/use-openssl-zlib-targets
Use openssl and zlib targets
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/c_glib/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | lib/cpp/CMakeLists.txt | 10 |
2 files changed, 17 insertions, 5 deletions
diff --git a/lib/c_glib/CMakeLists.txt b/lib/c_glib/CMakeLists.txt index 218f7dd7d..35571233d 100644 --- a/lib/c_glib/CMakeLists.txt +++ b/lib/c_glib/CMakeLists.txt @@ -97,10 +97,16 @@ target_link_libraries(thrift_c_glib PUBLIC ${SYSLIBS}) # If Zlib is not found just ignore the Zlib stuff if(WITH_ZLIB) - include_directories(SYSTEM ${ZLIB_INCLUDE_DIRS}) ADD_LIBRARY_THRIFT(thrift_c_glib_zlib ${thrift_c_glib_zlib_SOURCES}) - target_link_libraries(thrift_c_glib_zlib ${SYSLIBS} ${ZLIB_LIBRARIES}) - target_link_libraries(thrift_c_glib_zlib thrift_c_glib) + target_link_libraries(thrift_c_glib_zlib PUBLIC ${SYSLIBS}) + target_link_libraries(thrift_c_glib_zlib PUBLIC thrift_c_glib) + + if(TARGET ZLIB::ZLIB) + target_link_libraries(thrift_c_glib_zlib PUBLIC ZLIB::ZLIB) + else() + include_directories(SYSTEM ${ZLIB_INCLUDE_DIRS}) + target_link_libraries(thrift_c_glib_zlib PUBLIC ${ZLIB_LIBRARIES}) + endif() endif() # Install the headers diff --git a/lib/cpp/CMakeLists.txt b/lib/cpp/CMakeLists.txt index 13b41c5c6..6a66e5ad1 100644 --- a/lib/cpp/CMakeLists.txt +++ b/lib/cpp/CMakeLists.txt @@ -182,11 +182,17 @@ endif() if(WITH_ZLIB) find_package(ZLIB REQUIRED) - include_directories(SYSTEM ${ZLIB_INCLUDE_DIRS}) ADD_LIBRARY_THRIFT(thriftz ${thriftcppz_SOURCES}) target_link_libraries(thriftz PUBLIC thrift) - target_link_libraries(thriftz PUBLIC ${ZLIB_LIBRARIES}) + + if(TARGET ZLIB::ZLIB) + target_link_libraries(thriftz PUBLIC ZLIB::ZLIB) + else() + include_directories(SYSTEM ${ZLIB_INCLUDE_DIRS}) + target_link_libraries(thriftz PUBLIC ${ZLIB_LIBRARIES}) + endif() + ADD_PKGCONFIG_THRIFT(thrift-z) endif() |