--- a/components/cmake/Makefile Wed Dec 07 11:40:18 2011 -0800
+++ b/components/cmake/Makefile Wed Dec 07 14:04:51 2011 -0800
@@ -25,11 +25,11 @@
include ../../make-rules/shared-macros.mk
COMPONENT_NAME= cmake
-COMPONENT_VERSION= 2.6.2
+COMPONENT_VERSION= 2.8.6
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
-COMPONENT_ARCHIVE_HASH= sha1:48d33afaf23d40f2ea9aa2f5018c7213983222c2
-COMPONENT_ARCHIVE_URL= http://www.cmake.org/files/v2.6/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_HASH= sha1:7c2cbd42d27e26580cd4923892197b84b2a90675
+COMPONENT_ARCHIVE_URL= http://www.cmake.org/files/v2.8/$(COMPONENT_ARCHIVE)
COMPONENT_PROJECT_URL= http://www.cmake.org/
include $(WS_TOP)/make-rules/prep.mk
@@ -50,11 +50,13 @@
CONFIGURE_ENV += LDFLAGS="$(LDFLAGS)"
CONFIGURE_ENV += MAKE="$(GMAKE)"
-# CmakeCache-txt is created by configure, so we need to patch
-# it after configure
-COMPONENT_POST_CONFIGURE_ACTION = ( cd $(BUILD_DIR_$(BITS)); \
- $(GPATCH) $(GPATCH_FLAGS) < \
- $(COMPONENT_DIR)/patches-post-config/CmakeCache-txt.patch )
+# Use system-installed third-party libraries, rather than the private
+# copies in the cmake source. Only libarchive will come from the cmake
+# source, since it is not currently part of Solaris.
+CONFIGURE_OPTIONS += --system-curl
+CONFIGURE_OPTIONS += --system-expat
+CONFIGURE_OPTIONS += --system-zlib
+CONFIGURE_OPTIONS += --system-bzip2
COMPONENT_BUILD_ENV += CC="$(CC)"
COMPONENT_BUILD_ENV += CXX="$(CXX)"
@@ -62,6 +64,10 @@
COMPONENT_BUILD_ENV += MAKE="$(GMAKE)"
COMPONENT_BUILD_TARGETS = all
+# Need C and C++ compiler locations for cmake tests
+COMPONENT_TEST_ENV += CC="$(CC)"
+COMPONENT_TEST_ENV += CXX="$(CXX)"
+
COMPONENT_TEST_TARGETS = test
# common targets
@@ -70,7 +76,7 @@
install: $(INSTALL_32)
-# expected failures: curl, complex, complexOneConfig
+# expected failure: CTestTestUpload
test: $(TEST_32)
BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS)