Revision: 41887
http://brlcad.svn.sourceforge.net/brlcad/?rev=41887&view=rev
Author: starseeker
Date: 2010-12-30 22:28:50 +0000 (Thu, 30 Dec 2010)
Log Message:
-----------
If we're building with CMake, clear out zconf.h
Modified Paths:
--------------
brlcad/branches/cmake/src/other/CMakeLists.txt
Modified: brlcad/branches/cmake/src/other/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/other/CMakeLists.txt 2010-12-30 22:21:58 UTC
(rev 41886)
+++ brlcad/branches/cmake/src/other/CMakeLists.txt 2010-12-30 22:28:50 UTC
(rev 41887)
@@ -17,6 +17,9 @@
#---------------------------------------------------------------------------------
# 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)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
