Commit ffbe44e3 authored by Philip Trettner's avatar Philip Trettner

removed zconf.h renaming that caused rebuilds

parent 87b09efa
......@@ -73,17 +73,18 @@ if(MSVC)
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
endif()
if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
# If we're doing an out of source build and the user has a zconf.h
# in their source tree...
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h)
message(STATUS "Renaming")
message(STATUS " ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h")
message(STATUS "to 'zconf.h.included' because this file is included with zlib")
message(STATUS "but CMake generates it automatically in the build directory.")
file(RENAME ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.included)
endif()
endif()
# We keep zconf.h in our source
# if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
# # If we're doing an out of source build and the user has a zconf.h
# # in their source tree...
# if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h)
# message(STATUS "Renaming")
# message(STATUS " ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h")
# message(STATUS "to 'zconf.h.included' because this file is included with zlib")
# message(STATUS "but CMake generates it automatically in the build directory.")
# file(RENAME ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.included)
# endif()
# endif()
set(ZLIB_PC ${CMAKE_CURRENT_BINARY_DIR}/zlib.pc)
configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/zlib.pc.cmakein
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment