]> git.ipfire.org Git - thirdparty/zlib-ng.git/commitdiff
replaced include_directories() with target_include_directories()
authorGabriel Alexander <sleepyspacedad@gmail.com>
Tue, 12 Jun 2018 16:30:02 +0000 (12:30 -0400)
committerHans Kristian Rosbach <hk-github@circlestorm.org>
Thu, 9 Aug 2018 09:34:13 +0000 (11:34 +0200)
using target_include_directories() with the zlib libraries prevents people from having to manually include those directories when linking to those libraries

CMakeLists.txt

index 499fa066bfbc1e13b18d025f986636bf28811384..86dbfd2eab4a0065b3576011051a4ab37e7919c8 100644 (file)
@@ -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)