From bdb54bc1c985f6fc72712017c4776590c68ec940 Mon Sep 17 00:00:00 2001 From: Mario Emmenlauer Date: Tue, 31 Aug 2021 14:00:16 +0200 Subject: Use modern OpenSSL cmake syntax (if available), and larger cmake cleanup --- build/cmake/ThriftMacros.cmake | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) (limited to 'build') diff --git a/build/cmake/ThriftMacros.cmake b/build/cmake/ThriftMacros.cmake index 392b96bc0..65ca4ee85 100644 --- a/build/cmake/ThriftMacros.cmake +++ b/build/cmake/ThriftMacros.cmake @@ -28,7 +28,8 @@ macro(ADD_LIBRARY_THRIFT name) target_include_directories(${name} INTERFACE $) set_target_properties(${name} PROPERTIES OUTPUT_NAME ${name}${THRIFT_RUNTIME_POSTFIX} # windows link variants (/MT, /MD, /MTd, /MDd) get different names - VERSION ${thrift_VERSION} ) + VERSION ${thrift_VERSION}) + # set_target_properties(${name} PROPERTIES PUBLIC_HEADER "${thriftcpp_HEADERS}") install(TARGETS ${name} EXPORT "${name}Targets" RUNTIME DESTINATION "${BIN_INSTALL_DIR}" @@ -44,20 +45,4 @@ macro(ADD_LIBRARY_THRIFT name) FILE "${name}Targets.cmake" NAMESPACE "${name}::" DESTINATION "${CMAKE_INSTALL_DIR}/thrift") -endmacro() - -macro(TARGET_INCLUDE_DIRECTORIES_THRIFT name) - target_include_directories(${name} ${ARGN}) -endmacro() - -macro(TARGET_LINK_LIBRARIES_THRIFT name) - target_link_libraries(${name} ${ARGN}) -endmacro() - -macro(LINK_AGAINST_THRIFT_LIBRARY target) - target_link_libraries(${target} ${ARGN}) -endmacro() - -macro(TARGET_LINK_LIBRARIES_THRIFT_AGAINST_THRIFT_LIBRARY target libname) - target_link_libraries(${target} ${ARGN} ${libname}) -endmacro() +endmacro() \ No newline at end of file -- cgit v1.2.1