From: Gabriel Alexander Date: Tue, 12 Jun 2018 16:30:02 +0000 (-0400) Subject: replaced include_directories() with target_include_directories() X-Git-Tag: 1.9.9-b1~625 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a970eb938023281a39c79bdbc0c2d1385c298c08;p=thirdparty%2Fzlib-ng.git replaced include_directories() with target_include_directories() using target_include_directories() with the zlib libraries prevents people from having to manually include those directories when linking to those libraries --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 499fa066b..86dbfd2ea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -535,7 +535,6 @@ configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/zlib.pc.cmakein ${ZLIB_PC} @ONLY) configure_file( ${CMAKE_CURRENT_BINARY_DIR}/zconf${SUFFIX}.h.cmakein ${CMAKE_CURRENT_BINARY_DIR}/zconf${SUFFIX}.h @ONLY) -include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) #============================================================================ @@ -621,7 +620,9 @@ if(MINGW OR MSYS) endif(MINGW OR MSYS) add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_GZFILE_SRCS} ${ZLIB_ARCH_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) +target_include_directories(zlib PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_GZFILE_SRCS} ${ZLIB_ARCH_SRCS} ${ZLIB_ASMS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) +target_include_directories(zlibstatic PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL) set_target_properties(zlib PROPERTIES SOVERSION 1)