diff options
| author | Tobias Weihs <t.weihs@mint-medical.de> | 2022-08-19 10:49:51 +0200 |
|---|---|---|
| committer | Tobias Weihs <t.weihs@mint-medical.de> | 2022-09-11 18:38:08 +0200 |
| commit | fe73972ba61ca2c5fd7ebe3df1fb2aa285a09a9c (patch) | |
| tree | 49b2ce639ccbc09af94621bc3598072a27188345 /lib | |
| parent | 72d5912424211561adc6f8e7bc502180631d9f8e (diff) | |
| download | thrift-fe73972ba61ca2c5fd7ebe3df1fb2aa285a09a9c.tar.gz | |
prefer openssl and zlib targets over library paths
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() |