aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Kuemmel <syntheticpp@gmx.net>2012-03-17 19:56:03 +0100
committerMark Adler <madler@alumni.caltech.edu>2012-03-17 21:43:47 -0700
commit49b5d79a3bf448bbe011035d797806fc487b09fc (patch)
treee0a7355ad6de271c75f3ab1951325e969cf8380b
parentdbe0bed739c26a2c36319794108cb87ad77c5469 (diff)
downloadzlib-49b5d79a3bf448bbe011035d797806fc487b09fc.tar.gz
zlib-49b5d79a3bf448bbe011035d797806fc487b09fc.tar.bz2
zlib-49b5d79a3bf448bbe011035d797806fc487b09fc.zip
Rename zconf.h in CMakeLists.txt to move it out of the way.
-rw-r--r--CMakeLists.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 39530f2..5b61ea3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -67,11 +67,11 @@ if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
67 # If we're doing an out of source build and the user has a zconf.h 67 # If we're doing an out of source build and the user has a zconf.h
68 # in their source tree... 68 # in their source tree...
69 if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h) 69 if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h)
70 message(FATAL_ERROR 70 message(STATUS "Renaming")
71 "You must remove ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h " 71 message(STATUS " ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h")
72 "from the source tree. This file is included with zlib " 72 message(STATUS "to 'zconf.h.included' because this file is included with zlib")
73 "but CMake generates this file for you automatically " 73 message(STATUS "but CMake generates it automatically in the build directory.")
74 "in the build directory.") 74 file(RENAME ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.included)
75 endif() 75 endif()
76endif() 76endif()
77 77