Revision: 45716
http://brlcad.svn.sourceforge.net/brlcad/?rev=45716&view=rev
Author: brlcad
Date: 2011-07-28 19:36:34 +0000 (Thu, 28 Jul 2011)
Log Message:
-----------
test to see what breaks. leave the zconf.h file alone, don't abort if it
exists.
Modified Paths:
--------------
brlcad/trunk/src/other/CMakeLists.txt
brlcad/trunk/src/other/libz/CMakeLists.txt
Modified: brlcad/trunk/src/other/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/CMakeLists.txt 2011-07-28 19:10:56 UTC (rev
45715)
+++ brlcad/trunk/src/other/CMakeLists.txt 2011-07-28 19:36:34 UTC (rev
45716)
@@ -85,7 +85,6 @@
# zlib Library
# The autotools build needs this file, but the CMake zlib build doesn't
tolerate
# it - remove it if it's there.
-FILE(REMOVE ${CMAKE_CURRENT_SOURCE_DIR}/libz/zconf.h)
THIRD_PARTY_OPTION(ZLIB zlib)
THIRD_PARTY_SUBDIR(ZLIB libz)
Modified: brlcad/trunk/src/other/libz/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/other/libz/CMakeLists.txt 2011-07-28 19:10:56 UTC (rev
45715)
+++ brlcad/trunk/src/other/libz/CMakeLists.txt 2011-07-28 19:36:34 UTC (rev
45716)
@@ -58,18 +58,6 @@
add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
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(FATAL_ERROR
- "You must remove ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h "
- "from the source tree. This file is included with zlib "
- "but CMake generates this file for you automatically "
- "in the build directory.")
- endif()
-endif()
-
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.cmakein
${CMAKE_CURRENT_BINARY_DIR}/zconf.h @ONLY)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Got Input? Slashdot Needs You.
Take our quick survey online. Come on, we don't ask for help often.
Plus, you'll get a chance to win $100 to spend on ThinkGeek.
http://p.sf.net/sfu/slashdot-survey
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
