From e4867646ab5e3fefaf5dcd3c5d8414368c4c9c53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Terziman?= Date: Thu, 24 Oct 2013 10:11:08 +0200 Subject: [PATCH] Small corrections for the upgrading of zlib --- CMakeLists.txt | 2 +- contrib/zlib/CMakeLists.txt | 3 --- contrib/zlib/{zconf.h => zconf.h.included} | 0 3 files changed, 1 insertion(+), 4 deletions(-) rename contrib/zlib/{zconf.h => zconf.h.included} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9ebf26d29..fc13a85ac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -111,7 +111,7 @@ if( NOT ZLIB_FOUND ) add_subdirectory(contrib/zlib) set(ZLIB_FOUND 1) set(ZLIB_LIBRARIES zlib) - set(ZLIB_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/zlib) + set(ZLIB_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/contrib/zlib ${CMAKE_CURRENT_BINARY_DIR}/contrib/zlib) else(NOT ZLIB_FOUND) ADD_DEFINITIONS(-DASSIMP_BUILD_NO_OWN_ZLIB) endif(NOT ZLIB_FOUND) diff --git a/contrib/zlib/CMakeLists.txt b/contrib/zlib/CMakeLists.txt index 7d431ef34..d0952d278 100644 --- a/contrib/zlib/CMakeLists.txt +++ b/contrib/zlib/CMakeLists.txt @@ -219,9 +219,6 @@ endif() if(NOT SKIP_INSTALL_HEADERS AND NOT SKIP_INSTALL_ALL ) install(FILES ${ZLIB_PUBLIC_HDRS} DESTINATION "${INSTALL_INC_DIR}") endif() -if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL ) - install(FILES zlib.3 DESTINATION "${INSTALL_MAN_DIR}/man3") -endif() if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL ) install(FILES ${ZLIB_PC} DESTINATION "${INSTALL_PKGCONFIG_DIR}") endif() diff --git a/contrib/zlib/zconf.h b/contrib/zlib/zconf.h.included similarity index 100% rename from contrib/zlib/zconf.h rename to contrib/zlib/zconf.h.included