From e8579e0dbea6dd5d6f247d5aedb5bf447dd3bb4a Mon Sep 17 00:00:00 2001 From: Josef 'Jeff' Sipek Date: Sun, 7 Jun 2015 20:16:50 -0400 Subject: [PATCH] update cmake to 2.8.11 --- components/cmake/Makefile | 10 +- components/cmake/cmake.p5m | 466 +++--- components/cmake/patches/cmake-2.8.6.patch | 2116 ++++++++++------------------ 3 files changed, 996 insertions(+), 1596 deletions(-) rewrite components/cmake/patches/cmake-2.8.6.patch (72%) diff --git a/components/cmake/Makefile b/components/cmake/Makefile index 7cf94d9a0..689b5dbbb 100644 --- a/components/cmake/Makefile +++ b/components/cmake/Makefile @@ -20,6 +20,7 @@ # # Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright 2015 Josef 'Jeff' Sipek # # parfait seems to hang on libcmsysTestDynload.so.bc, so for @@ -29,11 +30,11 @@ PARFAIT_BUILD=no include ../../make-rules/shared-macros.mk COMPONENT_NAME= cmake -COMPONENT_VERSION= 2.8.6 +COMPONENT_VERSION= 2.8.11 COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz COMPONENT_ARCHIVE_HASH= \ - sha256:e6999b81ac367d85ffb0f69b6c4a0ef96f95dc154efd3592f9cfebacdf75728e + sha256:20d0d3661797fa82c19e7a75c7315c640e001cb3238331ca170bb0fae27feee5 COMPONENT_ARCHIVE_URL= http://www.cmake.org/files/v2.8/$(COMPONENT_ARCHIVE) COMPONENT_PROJECT_URL= http://www.cmake.org/ COMPONENT_BUGDB= utility/cmake @@ -56,6 +57,11 @@ CONFIGURE_ENV += CXXFLAGS="-library=stdcxx4" endif CONFIGURE_ENV += MAKE="$(GMAKE)" +CONFIGURE_OPTIONS = --prefix=$(CONFIGURE_PREFIX) +CONFIGURE_OPTIONS += --datadir=/share/cmake-2.8 +CONFIGURE_OPTIONS += --docdir=/share/doc/cmake-2.8 +CONFIGURE_OPTIONS += --mandir=/share/man + # 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. diff --git a/components/cmake/cmake.p5m b/components/cmake/cmake.p5m index c31fc670d..207e4d5d1 100644 --- a/components/cmake/cmake.p5m +++ b/components/cmake/cmake.p5m @@ -19,16 +19,11 @@ # CDDL HEADER END # # Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright 2015 Josef 'Jeff' Sipek # default mangler.man.stability uncommitted> -# Get manpages from usr/usr/share/man/man1 in proto area - set action.hash usr/usr/share/man/man1/%<1>> - -# Get usr/share/cmake-2.8/doc files from usr/doc/cmake-2.8 in proto area - set action.hash usr/doc/cmake-2.8/%<1>> - set name=pkg.fmri value=pkg:/developer/build/cmake@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) set name=pkg.summary value="A cross-platform, open-source make system" set name=pkg.description \ @@ -43,51 +38,36 @@ set name=org.opensolaris.consolidation value=$(CONSOLIDATION) set name=org.opensolaris.arc-caseid \ value=PSARC/2011/354 +license cmake.license license="BSD, MIT, GPLv2, Curl, PD" + +dir path=usr +dir path=usr/bin file path=usr/bin/ccmake file path=usr/bin/cmake file path=usr/bin/cpack file path=usr/bin/ctest +dir path=usr/share +dir path=usr/share/aclocal file path=usr/share/aclocal/cmake.m4 +dir path=usr/share/cmake-2.8 +dir path=usr/share/cmake-2.8/Modules file path=usr/share/cmake-2.8/Modules/AddFileDependencies.cmake file path=usr/share/cmake-2.8/Modules/AutomocInfo.cmake.in file path=usr/share/cmake-2.8/Modules/BasicConfigVersion-AnyNewerVersion.cmake.in +file path=usr/share/cmake-2.8/Modules/BasicConfigVersion-ExactVersion.cmake.in file path=usr/share/cmake-2.8/Modules/BasicConfigVersion-SameMajorVersion.cmake.in file path=usr/share/cmake-2.8/Modules/BundleUtilities.cmake -file path=usr/share/cmake-2.8/Modules/CheckCCompilerFlag.cmake -file path=usr/share/cmake-2.8/Modules/CheckCSourceCompiles.cmake -file path=usr/share/cmake-2.8/Modules/CheckCSourceRuns.cmake -file path=usr/share/cmake-2.8/Modules/CheckCXXCompilerFlag.cmake -file path=usr/share/cmake-2.8/Modules/CheckCXXSourceCompiles.cmake -file path=usr/share/cmake-2.8/Modules/CheckCXXSourceRuns.cmake -file path=usr/share/cmake-2.8/Modules/CheckCXXSymbolExists.cmake -file path=usr/share/cmake-2.8/Modules/CheckForPthreads.c -file path=usr/share/cmake-2.8/Modules/CheckFortranFunctionExists.cmake -file path=usr/share/cmake-2.8/Modules/CheckFunctionExists.c -file path=usr/share/cmake-2.8/Modules/CheckFunctionExists.cmake -file path=usr/share/cmake-2.8/Modules/CheckIncludeFile.c.in -file path=usr/share/cmake-2.8/Modules/CheckIncludeFile.cmake -file path=usr/share/cmake-2.8/Modules/CheckIncludeFile.cxx.in -file path=usr/share/cmake-2.8/Modules/CheckIncludeFileCXX.cmake -file path=usr/share/cmake-2.8/Modules/CheckIncludeFiles.cmake -file path=usr/share/cmake-2.8/Modules/CheckLibraryExists.cmake -file path=usr/share/cmake-2.8/Modules/CheckLibraryExists.lists.in -file path=usr/share/cmake-2.8/Modules/CheckPrototypeDefinition.c.in -file path=usr/share/cmake-2.8/Modules/CheckPrototypeDefinition.cmake -file path=usr/share/cmake-2.8/Modules/CheckSizeOf.cmake -file path=usr/share/cmake-2.8/Modules/CheckStructHasMember.cmake -file path=usr/share/cmake-2.8/Modules/CheckSymbolExists.cmake -file path=usr/share/cmake-2.8/Modules/CheckTypeSize.c.in -file path=usr/share/cmake-2.8/Modules/CheckTypeSize.cmake -file path=usr/share/cmake-2.8/Modules/CheckTypeSizeMap.cmake.in -file path=usr/share/cmake-2.8/Modules/CheckVariableExists.c -file path=usr/share/cmake-2.8/Modules/CheckVariableExists.cmake file path=usr/share/cmake-2.8/Modules/CMake.cmake -file path=usr/share/cmake-2.8/Modules/CMakeAddNewLanguage.txt -file path=usr/share/cmake-2.8/Modules/CMakeASM_MASMInformation.cmake -file path=usr/share/cmake-2.8/Modules/CMakeASM_NASMInformation.cmake file path=usr/share/cmake-2.8/Modules/CMakeASM-ATTInformation.cmake file path=usr/share/cmake-2.8/Modules/CMakeASMCompiler.cmake.in file path=usr/share/cmake-2.8/Modules/CMakeASMInformation.cmake +file path=usr/share/cmake-2.8/Modules/CMakeASM_MASMInformation.cmake +file path=usr/share/cmake-2.8/Modules/CMakeASM_NASMInformation.cmake +dir path=usr/share/cmake-2.8/Modules/CMakeAddFortranSubdirectory +file path=usr/share/cmake-2.8/Modules/CMakeAddFortranSubdirectory.cmake +file path=usr/share/cmake-2.8/Modules/CMakeAddFortranSubdirectory/build_mingw.cmake.in +file path=usr/share/cmake-2.8/Modules/CMakeAddFortranSubdirectory/config_mingw.cmake.in +file path=usr/share/cmake-2.8/Modules/CMakeAddNewLanguage.txt file path=usr/share/cmake-2.8/Modules/CMakeBackwardCompatibilityC.cmake file path=usr/share/cmake-2.8/Modules/CMakeBackwardCompatibilityCXX.cmake file path=usr/share/cmake-2.8/Modules/CMakeBorlandFindMake.cmake @@ -96,27 +76,30 @@ file path=usr/share/cmake-2.8/Modules/CMakeCCompiler.cmake.in file path=usr/share/cmake-2.8/Modules/CMakeCCompilerABI.c file path=usr/share/cmake-2.8/Modules/CMakeCCompilerId.c.in file path=usr/share/cmake-2.8/Modules/CMakeCInformation.cmake -file path=usr/share/cmake-2.8/Modules/CMakeCommonLanguageInclude.cmake -file path=usr/share/cmake-2.8/Modules/CMakeCompilerABI.h -file path=usr/share/cmake-2.8/Modules/CMakeConfigurableFile.in file path=usr/share/cmake-2.8/Modules/CMakeCXXCompiler.cmake.in file path=usr/share/cmake-2.8/Modules/CMakeCXXCompilerABI.cpp file path=usr/share/cmake-2.8/Modules/CMakeCXXCompilerId.cpp.in file path=usr/share/cmake-2.8/Modules/CMakeCXXInformation.cmake +file path=usr/share/cmake-2.8/Modules/CMakeClDeps.cmake +file path=usr/share/cmake-2.8/Modules/CMakeCommonLanguageInclude.cmake +file path=usr/share/cmake-2.8/Modules/CMakeCompilerABI.h +file path=usr/share/cmake-2.8/Modules/CMakeConfigurableFile.in file path=usr/share/cmake-2.8/Modules/CMakeDependentOption.cmake -file path=usr/share/cmake-2.8/Modules/CMakeDetermineASM_MASMCompiler.cmake -file path=usr/share/cmake-2.8/Modules/CMakeDetermineASM_NASMCompiler.cmake file path=usr/share/cmake-2.8/Modules/CMakeDetermineASM-ATTCompiler.cmake file path=usr/share/cmake-2.8/Modules/CMakeDetermineASMCompiler.cmake +file path=usr/share/cmake-2.8/Modules/CMakeDetermineASM_MASMCompiler.cmake +file path=usr/share/cmake-2.8/Modules/CMakeDetermineASM_NASMCompiler.cmake file path=usr/share/cmake-2.8/Modules/CMakeDetermineCCompiler.cmake +file path=usr/share/cmake-2.8/Modules/CMakeDetermineCXXCompiler.cmake +file path=usr/share/cmake-2.8/Modules/CMakeDetermineCompiler.cmake file path=usr/share/cmake-2.8/Modules/CMakeDetermineCompilerABI.cmake file path=usr/share/cmake-2.8/Modules/CMakeDetermineCompilerId.cmake -file path=usr/share/cmake-2.8/Modules/CMakeDetermineCXXCompiler.cmake file path=usr/share/cmake-2.8/Modules/CMakeDetermineFortranCompiler.cmake file path=usr/share/cmake-2.8/Modules/CMakeDetermineJavaCompiler.cmake file path=usr/share/cmake-2.8/Modules/CMakeDetermineRCCompiler.cmake file path=usr/share/cmake-2.8/Modules/CMakeDetermineSystem.cmake file path=usr/share/cmake-2.8/Modules/CMakeDetermineVSServicePack.cmake +file path=usr/share/cmake-2.8/Modules/CMakeExpandImportedTargets.cmake file path=usr/share/cmake-2.8/Modules/CMakeExportBuildSettings.cmake file path=usr/share/cmake-2.8/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake file path=usr/share/cmake-2.8/Modules/CMakeFindBinUtils.cmake @@ -134,12 +117,14 @@ file path=usr/share/cmake-2.8/Modules/CMakeFortranCompilerId.F.in file path=usr/share/cmake-2.8/Modules/CMakeFortranInformation.cmake file path=usr/share/cmake-2.8/Modules/CMakeGenericSystem.cmake file path=usr/share/cmake-2.8/Modules/CMakeImportBuildSettings.cmake +file path=usr/share/cmake-2.8/Modules/CMakeJOMFindMake.cmake file path=usr/share/cmake-2.8/Modules/CMakeJavaCompiler.cmake.in file path=usr/share/cmake-2.8/Modules/CMakeJavaInformation.cmake -file path=usr/share/cmake-2.8/Modules/CMakeJOMFindMake.cmake -file path=usr/share/cmake-2.8/Modules/CMakeMinGWFindMake.cmake file path=usr/share/cmake-2.8/Modules/CMakeMSYSFindMake.cmake +file path=usr/share/cmake-2.8/Modules/CMakeMinGWFindMake.cmake file path=usr/share/cmake-2.8/Modules/CMakeNMakeFindMake.cmake +file path=usr/share/cmake-2.8/Modules/CMakeNinjaFindMake.cmake +file path=usr/share/cmake-2.8/Modules/CMakePackageConfigHelpers.cmake file path=usr/share/cmake-2.8/Modules/CMakeParseArguments.cmake file path=usr/share/cmake-2.8/Modules/CMakeParseImplicitLinkInfo.cmake file path=usr/share/cmake-2.8/Modules/CMakePlatformId.h.in @@ -149,22 +134,19 @@ file path=usr/share/cmake-2.8/Modules/CMakeRCCompiler.cmake.in file path=usr/share/cmake-2.8/Modules/CMakeRCInformation.cmake file path=usr/share/cmake-2.8/Modules/CMakeSystem.cmake.in file path=usr/share/cmake-2.8/Modules/CMakeSystemSpecificInformation.cmake -file path=usr/share/cmake-2.8/Modules/CMakeTestASM_MASMCompiler.cmake -file path=usr/share/cmake-2.8/Modules/CMakeTestASM_NASMCompiler.cmake file path=usr/share/cmake-2.8/Modules/CMakeTestASM-ATTCompiler.cmake file path=usr/share/cmake-2.8/Modules/CMakeTestASMCompiler.cmake +file path=usr/share/cmake-2.8/Modules/CMakeTestASM_MASMCompiler.cmake +file path=usr/share/cmake-2.8/Modules/CMakeTestASM_NASMCompiler.cmake file path=usr/share/cmake-2.8/Modules/CMakeTestCCompiler.cmake -file path=usr/share/cmake-2.8/Modules/CMakeTestCompilerCommon.cmake file path=usr/share/cmake-2.8/Modules/CMakeTestCXXCompiler.cmake -file path=usr/share/cmake-2.8/Modules/CMakeTestForFreeVC.cxx +file path=usr/share/cmake-2.8/Modules/CMakeTestCompilerCommon.cmake file path=usr/share/cmake-2.8/Modules/CMakeTestFortranCompiler.cmake file path=usr/share/cmake-2.8/Modules/CMakeTestGNU.c file path=usr/share/cmake-2.8/Modules/CMakeTestJavaCompiler.cmake -file path=usr/share/cmake-2.8/Modules/CMakeTestNMakeCLVersion.c file path=usr/share/cmake-2.8/Modules/CMakeTestRCCompiler.cmake file path=usr/share/cmake-2.8/Modules/CMakeTestWatcomVersion.c file path=usr/share/cmake-2.8/Modules/CMakeUnixFindMake.cmake -file path=usr/share/cmake-2.8/Modules/CMakeVerifyManifest.cmake file path=usr/share/cmake-2.8/Modules/CMakeVS10FindMake.cmake file path=usr/share/cmake-2.8/Modules/CMakeVS11FindMake.cmake file path=usr/share/cmake-2.8/Modules/CMakeVS6BackwardCompatibility.cmake @@ -174,9 +156,69 @@ file path=usr/share/cmake-2.8/Modules/CMakeVS7BackwardCompatibility.cmake file path=usr/share/cmake-2.8/Modules/CMakeVS7FindMake.cmake file path=usr/share/cmake-2.8/Modules/CMakeVS8FindMake.cmake file path=usr/share/cmake-2.8/Modules/CMakeVS9FindMake.cmake +file path=usr/share/cmake-2.8/Modules/CMakeVerifyManifest.cmake +file path=usr/share/cmake-2.8/Modules/CPack.DS_Store.in +file path=usr/share/cmake-2.8/Modules/CPack.Description.plist.in +file path=usr/share/cmake-2.8/Modules/CPack.Info.plist.in +file path=usr/share/cmake-2.8/Modules/CPack.OSXScriptLauncher.in +file path=usr/share/cmake-2.8/Modules/CPack.OSXScriptLauncher.rsrc.in +file path=usr/share/cmake-2.8/Modules/CPack.OSXX11.Info.plist.in +file path=usr/share/cmake-2.8/Modules/CPack.OSXX11.main.scpt.in +file path=usr/share/cmake-2.8/Modules/CPack.RuntimeScript.in +file path=usr/share/cmake-2.8/Modules/CPack.STGZ_Header.sh.in +file path=usr/share/cmake-2.8/Modules/CPack.VolumeIcon.icns.in +file path=usr/share/cmake-2.8/Modules/CPack.background.png.in +file path=usr/share/cmake-2.8/Modules/CPack.cmake +file path=usr/share/cmake-2.8/Modules/CPack.distribution.dist.in +file path=usr/share/cmake-2.8/Modules/CPackBundle.cmake +file path=usr/share/cmake-2.8/Modules/CPackComponent.cmake +file path=usr/share/cmake-2.8/Modules/CPackCygwin.cmake +file path=usr/share/cmake-2.8/Modules/CPackDMG.cmake +file path=usr/share/cmake-2.8/Modules/CPackDeb.cmake +file path=usr/share/cmake-2.8/Modules/CPackNSIS.cmake +file path=usr/share/cmake-2.8/Modules/CPackPackageMaker.cmake +file path=usr/share/cmake-2.8/Modules/CPackRPM.cmake +file path=usr/share/cmake-2.8/Modules/CPackWIX.cmake +file path=usr/share/cmake-2.8/Modules/CPackZIP.cmake +file path=usr/share/cmake-2.8/Modules/CTest.cmake +file path=usr/share/cmake-2.8/Modules/CTestScriptMode.cmake +file path=usr/share/cmake-2.8/Modules/CTestTargets.cmake +file path=usr/share/cmake-2.8/Modules/CTestUseLaunchers.cmake +file path=usr/share/cmake-2.8/Modules/CheckCCompilerFlag.cmake +file path=usr/share/cmake-2.8/Modules/CheckCSourceCompiles.cmake +file path=usr/share/cmake-2.8/Modules/CheckCSourceRuns.cmake +file path=usr/share/cmake-2.8/Modules/CheckCXXCompilerFlag.cmake +file path=usr/share/cmake-2.8/Modules/CheckCXXSourceCompiles.cmake +file path=usr/share/cmake-2.8/Modules/CheckCXXSourceRuns.cmake +file path=usr/share/cmake-2.8/Modules/CheckCXXSymbolExists.cmake +file path=usr/share/cmake-2.8/Modules/CheckForPthreads.c +file path=usr/share/cmake-2.8/Modules/CheckFortranFunctionExists.cmake +file path=usr/share/cmake-2.8/Modules/CheckFunctionExists.c +file path=usr/share/cmake-2.8/Modules/CheckFunctionExists.cmake +file path=usr/share/cmake-2.8/Modules/CheckIncludeFile.c.in +file path=usr/share/cmake-2.8/Modules/CheckIncludeFile.cmake +file path=usr/share/cmake-2.8/Modules/CheckIncludeFile.cxx.in +file path=usr/share/cmake-2.8/Modules/CheckIncludeFileCXX.cmake +file path=usr/share/cmake-2.8/Modules/CheckIncludeFiles.cmake +file path=usr/share/cmake-2.8/Modules/CheckLanguage.cmake +file path=usr/share/cmake-2.8/Modules/CheckLibraryExists.cmake +file path=usr/share/cmake-2.8/Modules/CheckLibraryExists.lists.in +file path=usr/share/cmake-2.8/Modules/CheckPrototypeDefinition.c.in +file path=usr/share/cmake-2.8/Modules/CheckPrototypeDefinition.cmake +file path=usr/share/cmake-2.8/Modules/CheckSizeOf.cmake +file path=usr/share/cmake-2.8/Modules/CheckStructHasMember.cmake +file path=usr/share/cmake-2.8/Modules/CheckSymbolExists.cmake +file path=usr/share/cmake-2.8/Modules/CheckTypeSize.c.in +file path=usr/share/cmake-2.8/Modules/CheckTypeSize.cmake +file path=usr/share/cmake-2.8/Modules/CheckTypeSizeMap.cmake.in +file path=usr/share/cmake-2.8/Modules/CheckVariableExists.c +file path=usr/share/cmake-2.8/Modules/CheckVariableExists.cmake +dir path=usr/share/cmake-2.8/Modules/Compiler file path=usr/share/cmake-2.8/Modules/Compiler/Absoft-Fortran.cmake +file path=usr/share/cmake-2.8/Modules/Compiler/Clang-ASM.cmake file path=usr/share/cmake-2.8/Modules/Compiler/Clang-C.cmake file path=usr/share/cmake-2.8/Modules/Compiler/Clang-CXX.cmake +file path=usr/share/cmake-2.8/Modules/Compiler/Clang.cmake file path=usr/share/cmake-2.8/Modules/Compiler/Cray-C.cmake file path=usr/share/cmake-2.8/Modules/Compiler/Cray-CXX.cmake file path=usr/share/cmake-2.8/Modules/Compiler/Cray-Fortran.cmake @@ -198,14 +240,14 @@ file path=usr/share/cmake-2.8/Modules/Compiler/MIPSpro-C.cmake file path=usr/share/cmake-2.8/Modules/Compiler/MIPSpro-CXX.cmake file path=usr/share/cmake-2.8/Modules/Compiler/MIPSpro-Fortran.cmake file path=usr/share/cmake-2.8/Modules/Compiler/NAG-Fortran.cmake -file path=usr/share/cmake-2.8/Modules/Compiler/PathScale-C.cmake -file path=usr/share/cmake-2.8/Modules/Compiler/PathScale-CXX.cmake -file path=usr/share/cmake-2.8/Modules/Compiler/PathScale-Fortran.cmake -file path=usr/share/cmake-2.8/Modules/Compiler/PathScale.cmake file path=usr/share/cmake-2.8/Modules/Compiler/PGI-C.cmake file path=usr/share/cmake-2.8/Modules/Compiler/PGI-CXX.cmake file path=usr/share/cmake-2.8/Modules/Compiler/PGI-Fortran.cmake file path=usr/share/cmake-2.8/Modules/Compiler/PGI.cmake +file path=usr/share/cmake-2.8/Modules/Compiler/PathScale-C.cmake +file path=usr/share/cmake-2.8/Modules/Compiler/PathScale-CXX.cmake +file path=usr/share/cmake-2.8/Modules/Compiler/PathScale-Fortran.cmake +file path=usr/share/cmake-2.8/Modules/Compiler/PathScale.cmake file path=usr/share/cmake-2.8/Modules/Compiler/SCO-C.cmake file path=usr/share/cmake-2.8/Modules/Compiler/SCO-CXX.cmake file path=usr/share/cmake-2.8/Modules/Compiler/SCO.cmake @@ -213,6 +255,10 @@ file path=usr/share/cmake-2.8/Modules/Compiler/SunPro-ASM.cmake file path=usr/share/cmake-2.8/Modules/Compiler/SunPro-C.cmake file path=usr/share/cmake-2.8/Modules/Compiler/SunPro-CXX.cmake file path=usr/share/cmake-2.8/Modules/Compiler/SunPro-Fortran.cmake +file path=usr/share/cmake-2.8/Modules/Compiler/TI-ASM.cmake +file path=usr/share/cmake-2.8/Modules/Compiler/TI-C.cmake +file path=usr/share/cmake-2.8/Modules/Compiler/TI-CXX.cmake +file path=usr/share/cmake-2.8/Modules/Compiler/TinyCC-C.cmake file path=usr/share/cmake-2.8/Modules/Compiler/VisualAge-C.cmake file path=usr/share/cmake-2.8/Modules/Compiler/VisualAge-CXX.cmake file path=usr/share/cmake-2.8/Modules/Compiler/VisualAge-Fortran.cmake @@ -221,59 +267,47 @@ file path=usr/share/cmake-2.8/Modules/Compiler/XL-C.cmake file path=usr/share/cmake-2.8/Modules/Compiler/XL-CXX.cmake file path=usr/share/cmake-2.8/Modules/Compiler/XL-Fortran.cmake file path=usr/share/cmake-2.8/Modules/Compiler/XL.cmake -file path=usr/share/cmake-2.8/Modules/CPack.background.png.in -file path=usr/share/cmake-2.8/Modules/CPack.cmake -file path=usr/share/cmake-2.8/Modules/CPack.Description.plist.in -file path=usr/share/cmake-2.8/Modules/CPack.distribution.dist.in -file path=usr/share/cmake-2.8/Modules/CPack.DS_Store.in -file path=usr/share/cmake-2.8/Modules/CPack.Info.plist.in -file path=usr/share/cmake-2.8/Modules/CPack.OSXScriptLauncher.in -file path=usr/share/cmake-2.8/Modules/CPack.OSXScriptLauncher.rsrc.in -file path=usr/share/cmake-2.8/Modules/CPack.OSXX11.Info.plist.in -file path=usr/share/cmake-2.8/Modules/CPack.OSXX11.main.scpt.in -file path=usr/share/cmake-2.8/Modules/CPack.RuntimeScript.in -file path=usr/share/cmake-2.8/Modules/CPack.STGZ_Header.sh.in -file path=usr/share/cmake-2.8/Modules/CPack.VolumeIcon.icns.in -file path=usr/share/cmake-2.8/Modules/CPackBundle.cmake -file path=usr/share/cmake-2.8/Modules/CPackComponent.cmake -file path=usr/share/cmake-2.8/Modules/CPackDeb.cmake -file path=usr/share/cmake-2.8/Modules/CPackNSIS.cmake -file path=usr/share/cmake-2.8/Modules/CPackRPM.cmake -file path=usr/share/cmake-2.8/Modules/CPackZIP.cmake -file path=usr/share/cmake-2.8/Modules/CTest.cmake -file path=usr/share/cmake-2.8/Modules/CTestScriptMode.cmake -file path=usr/share/cmake-2.8/Modules/CTestTargets.cmake +dir path=usr/share/cmake-2.8/Modules/CompilerId +file path=usr/share/cmake-2.8/Modules/CompilerId/VS-10.vcxproj.in +file path=usr/share/cmake-2.8/Modules/CompilerId/VS-6.dsp.in +file path=usr/share/cmake-2.8/Modules/CompilerId/VS-7.vcproj.in +file path=usr/share/cmake-2.8/Modules/CompilerId/Xcode-1.pbxproj.in +file path=usr/share/cmake-2.8/Modules/CompilerId/Xcode-2.pbxproj.in +file path=usr/share/cmake-2.8/Modules/CompilerId/Xcode-3.pbxproj.in file path=usr/share/cmake-2.8/Modules/Dart.cmake file path=usr/share/cmake-2.8/Modules/DartConfiguration.tcl.in +file path=usr/share/cmake-2.8/Modules/DeployQt4.cmake file path=usr/share/cmake-2.8/Modules/Documentation.cmake file path=usr/share/cmake-2.8/Modules/DummyCXXFile.cxx -file path=usr/share/cmake-2.8/Modules/ecos_clean.cmake -file path=usr/share/cmake-2.8/Modules/exportheader.cmake.in +file path=usr/share/cmake-2.8/Modules/ExternalData.cmake +file path=usr/share/cmake-2.8/Modules/ExternalData_config.cmake.in file path=usr/share/cmake-2.8/Modules/ExternalProject.cmake +file path=usr/share/cmake-2.8/Modules/FLTKCompatibility.cmake file path=usr/share/cmake-2.8/Modules/FeatureSummary.cmake file path=usr/share/cmake-2.8/Modules/FindALSA.cmake -file path=usr/share/cmake-2.8/Modules/FindArmadillo.cmake file path=usr/share/cmake-2.8/Modules/FindASPELL.cmake file path=usr/share/cmake-2.8/Modules/FindAVIFile.cmake +file path=usr/share/cmake-2.8/Modules/FindArmadillo.cmake file path=usr/share/cmake-2.8/Modules/FindBISON.cmake file path=usr/share/cmake-2.8/Modules/FindBLAS.cmake +file path=usr/share/cmake-2.8/Modules/FindBZip2.cmake file path=usr/share/cmake-2.8/Modules/FindBoost.cmake file path=usr/share/cmake-2.8/Modules/FindBullet.cmake -file path=usr/share/cmake-2.8/Modules/FindBZip2.cmake file path=usr/share/cmake-2.8/Modules/FindCABLE.cmake -file path=usr/share/cmake-2.8/Modules/FindCoin3D.cmake +dir path=usr/share/cmake-2.8/Modules/FindCUDA file path=usr/share/cmake-2.8/Modules/FindCUDA.cmake file path=usr/share/cmake-2.8/Modules/FindCUDA/make2cmake.cmake file path=usr/share/cmake-2.8/Modules/FindCUDA/parse_cubin.cmake file path=usr/share/cmake-2.8/Modules/FindCUDA/run_nvcc.cmake -file path=usr/share/cmake-2.8/Modules/FindCups.cmake file path=usr/share/cmake-2.8/Modules/FindCURL.cmake -file path=usr/share/cmake-2.8/Modules/FindCurses.cmake file path=usr/share/cmake-2.8/Modules/FindCVS.cmake +file path=usr/share/cmake-2.8/Modules/FindCoin3D.cmake +file path=usr/share/cmake-2.8/Modules/FindCups.cmake +file path=usr/share/cmake-2.8/Modules/FindCurses.cmake file path=usr/share/cmake-2.8/Modules/FindCxxTest.cmake file path=usr/share/cmake-2.8/Modules/FindCygwin.cmake -file path=usr/share/cmake-2.8/Modules/FindDart.cmake file path=usr/share/cmake-2.8/Modules/FindDCMTK.cmake +file path=usr/share/cmake-2.8/Modules/FindDart.cmake file path=usr/share/cmake-2.8/Modules/FindDevIL.cmake file path=usr/share/cmake-2.8/Modules/FindDoxygen.cmake file path=usr/share/cmake-2.8/Modules/FindEXPAT.cmake @@ -283,73 +317,59 @@ file path=usr/share/cmake-2.8/Modules/FindFLTK2.cmake file path=usr/share/cmake-2.8/Modules/FindFreetype.cmake file path=usr/share/cmake-2.8/Modules/FindGCCXML.cmake file path=usr/share/cmake-2.8/Modules/FindGDAL.cmake -file path=usr/share/cmake-2.8/Modules/FindGettext.cmake file path=usr/share/cmake-2.8/Modules/FindGIF.cmake -file path=usr/share/cmake-2.8/Modules/FindGit.cmake +file path=usr/share/cmake-2.8/Modules/FindGLEW.cmake file path=usr/share/cmake-2.8/Modules/FindGLU.cmake file path=usr/share/cmake-2.8/Modules/FindGLUT.cmake -file path=usr/share/cmake-2.8/Modules/FindGnuplot.cmake -file path=usr/share/cmake-2.8/Modules/FindGnuTLS.cmake -file path=usr/share/cmake-2.8/Modules/FindGTest.cmake file path=usr/share/cmake-2.8/Modules/FindGTK.cmake file path=usr/share/cmake-2.8/Modules/FindGTK2.cmake +file path=usr/share/cmake-2.8/Modules/FindGTest.cmake +file path=usr/share/cmake-2.8/Modules/FindGettext.cmake +file path=usr/share/cmake-2.8/Modules/FindGit.cmake +file path=usr/share/cmake-2.8/Modules/FindGnuTLS.cmake +file path=usr/share/cmake-2.8/Modules/FindGnuplot.cmake file path=usr/share/cmake-2.8/Modules/FindHDF5.cmake file path=usr/share/cmake-2.8/Modules/FindHSPELL.cmake file path=usr/share/cmake-2.8/Modules/FindHTMLHelp.cmake -file path=usr/share/cmake-2.8/Modules/FindImageMagick.cmake +file path=usr/share/cmake-2.8/Modules/FindHg.cmake file path=usr/share/cmake-2.8/Modules/FindITK.cmake -file path=usr/share/cmake-2.8/Modules/FindJasper.cmake -file path=usr/share/cmake-2.8/Modules/FindJava.cmake +file path=usr/share/cmake-2.8/Modules/FindIcotool.cmake +file path=usr/share/cmake-2.8/Modules/FindImageMagick.cmake file path=usr/share/cmake-2.8/Modules/FindJNI.cmake file path=usr/share/cmake-2.8/Modules/FindJPEG.cmake +file path=usr/share/cmake-2.8/Modules/FindJasper.cmake +file path=usr/share/cmake-2.8/Modules/FindJava.cmake file path=usr/share/cmake-2.8/Modules/FindKDE3.cmake file path=usr/share/cmake-2.8/Modules/FindKDE4.cmake file path=usr/share/cmake-2.8/Modules/FindLAPACK.cmake file path=usr/share/cmake-2.8/Modules/FindLATEX.cmake file path=usr/share/cmake-2.8/Modules/FindLibArchive.cmake +file path=usr/share/cmake-2.8/Modules/FindLibLZMA.cmake file path=usr/share/cmake-2.8/Modules/FindLibXml2.cmake file path=usr/share/cmake-2.8/Modules/FindLibXslt.cmake file path=usr/share/cmake-2.8/Modules/FindLua50.cmake file path=usr/share/cmake-2.8/Modules/FindLua51.cmake -file path=usr/share/cmake-2.8/Modules/FindMatlab.cmake file path=usr/share/cmake-2.8/Modules/FindMFC.cmake -file path=usr/share/cmake-2.8/Modules/FindMotif.cmake file path=usr/share/cmake-2.8/Modules/FindMPEG.cmake file path=usr/share/cmake-2.8/Modules/FindMPEG2.cmake file path=usr/share/cmake-2.8/Modules/FindMPI.cmake +file path=usr/share/cmake-2.8/Modules/FindMatlab.cmake +file path=usr/share/cmake-2.8/Modules/FindMotif.cmake file path=usr/share/cmake-2.8/Modules/FindOpenAL.cmake file path=usr/share/cmake-2.8/Modules/FindOpenGL.cmake file path=usr/share/cmake-2.8/Modules/FindOpenMP.cmake -file path=usr/share/cmake-2.8/Modules/FindOpenSceneGraph.cmake file path=usr/share/cmake-2.8/Modules/FindOpenSSL.cmake +file path=usr/share/cmake-2.8/Modules/FindOpenSceneGraph.cmake file path=usr/share/cmake-2.8/Modules/FindOpenThreads.cmake -file path=usr/share/cmake-2.8/Modules/Findosg_functions.cmake -file path=usr/share/cmake-2.8/Modules/Findosg.cmake -file path=usr/share/cmake-2.8/Modules/FindosgAnimation.cmake -file path=usr/share/cmake-2.8/Modules/FindosgDB.cmake -file path=usr/share/cmake-2.8/Modules/FindosgFX.cmake -file path=usr/share/cmake-2.8/Modules/FindosgGA.cmake -file path=usr/share/cmake-2.8/Modules/FindosgIntrospection.cmake -file path=usr/share/cmake-2.8/Modules/FindosgManipulator.cmake -file path=usr/share/cmake-2.8/Modules/FindosgParticle.cmake -file path=usr/share/cmake-2.8/Modules/FindosgProducer.cmake -file path=usr/share/cmake-2.8/Modules/FindosgShadow.cmake -file path=usr/share/cmake-2.8/Modules/FindosgSim.cmake -file path=usr/share/cmake-2.8/Modules/FindosgTerrain.cmake -file path=usr/share/cmake-2.8/Modules/FindosgText.cmake -file path=usr/share/cmake-2.8/Modules/FindosgUtil.cmake -file path=usr/share/cmake-2.8/Modules/FindosgViewer.cmake -file path=usr/share/cmake-2.8/Modules/FindosgVolume.cmake -file path=usr/share/cmake-2.8/Modules/FindosgWidget.cmake +file path=usr/share/cmake-2.8/Modules/FindPHP4.cmake +file path=usr/share/cmake-2.8/Modules/FindPNG.cmake file path=usr/share/cmake-2.8/Modules/FindPackageHandleStandardArgs.cmake file path=usr/share/cmake-2.8/Modules/FindPackageMessage.cmake file path=usr/share/cmake-2.8/Modules/FindPerl.cmake file path=usr/share/cmake-2.8/Modules/FindPerlLibs.cmake -file path=usr/share/cmake-2.8/Modules/FindPHP4.cmake file path=usr/share/cmake-2.8/Modules/FindPhysFS.cmake file path=usr/share/cmake-2.8/Modules/FindPike.cmake file path=usr/share/cmake-2.8/Modules/FindPkgConfig.cmake -file path=usr/share/cmake-2.8/Modules/FindPNG.cmake file path=usr/share/cmake-2.8/Modules/FindPostgreSQL.cmake file path=usr/share/cmake-2.8/Modules/FindProducer.cmake file path=usr/share/cmake-2.8/Modules/FindProtobuf.cmake @@ -361,68 +381,90 @@ file path=usr/share/cmake-2.8/Modules/FindQt4.cmake file path=usr/share/cmake-2.8/Modules/FindQuickTime.cmake file path=usr/share/cmake-2.8/Modules/FindRTI.cmake file path=usr/share/cmake-2.8/Modules/FindRuby.cmake +file path=usr/share/cmake-2.8/Modules/FindSDL.cmake file path=usr/share/cmake-2.8/Modules/FindSDL_image.cmake file path=usr/share/cmake-2.8/Modules/FindSDL_mixer.cmake file path=usr/share/cmake-2.8/Modules/FindSDL_net.cmake file path=usr/share/cmake-2.8/Modules/FindSDL_sound.cmake file path=usr/share/cmake-2.8/Modules/FindSDL_ttf.cmake -file path=usr/share/cmake-2.8/Modules/FindSDL.cmake +file path=usr/share/cmake-2.8/Modules/FindSWIG.cmake file path=usr/share/cmake-2.8/Modules/FindSelfPackers.cmake file path=usr/share/cmake-2.8/Modules/FindSquish.cmake file path=usr/share/cmake-2.8/Modules/FindSubversion.cmake -file path=usr/share/cmake-2.8/Modules/FindSWIG.cmake file path=usr/share/cmake-2.8/Modules/FindTCL.cmake -file path=usr/share/cmake-2.8/Modules/FindTclsh.cmake +file path=usr/share/cmake-2.8/Modules/FindTIFF.cmake file path=usr/share/cmake-2.8/Modules/FindTclStub.cmake +file path=usr/share/cmake-2.8/Modules/FindTclsh.cmake file path=usr/share/cmake-2.8/Modules/FindThreads.cmake -file path=usr/share/cmake-2.8/Modules/FindTIFF.cmake file path=usr/share/cmake-2.8/Modules/FindUnixCommands.cmake file path=usr/share/cmake-2.8/Modules/FindVTK.cmake file path=usr/share/cmake-2.8/Modules/FindWget.cmake file path=usr/share/cmake-2.8/Modules/FindWish.cmake -file path=usr/share/cmake-2.8/Modules/FindwxWidgets.cmake -file path=usr/share/cmake-2.8/Modules/FindwxWindows.cmake file path=usr/share/cmake-2.8/Modules/FindX11.cmake file path=usr/share/cmake-2.8/Modules/FindXMLRPC.cmake file path=usr/share/cmake-2.8/Modules/FindZLIB.cmake -file path=usr/share/cmake-2.8/Modules/FLTKCompatibility.cmake +file path=usr/share/cmake-2.8/Modules/Findosg.cmake +file path=usr/share/cmake-2.8/Modules/FindosgAnimation.cmake +file path=usr/share/cmake-2.8/Modules/FindosgDB.cmake +file path=usr/share/cmake-2.8/Modules/FindosgFX.cmake +file path=usr/share/cmake-2.8/Modules/FindosgGA.cmake +file path=usr/share/cmake-2.8/Modules/FindosgIntrospection.cmake +file path=usr/share/cmake-2.8/Modules/FindosgManipulator.cmake +file path=usr/share/cmake-2.8/Modules/FindosgParticle.cmake +file path=usr/share/cmake-2.8/Modules/FindosgPresentation.cmake +file path=usr/share/cmake-2.8/Modules/FindosgProducer.cmake +file path=usr/share/cmake-2.8/Modules/FindosgQt.cmake +file path=usr/share/cmake-2.8/Modules/FindosgShadow.cmake +file path=usr/share/cmake-2.8/Modules/FindosgSim.cmake +file path=usr/share/cmake-2.8/Modules/FindosgTerrain.cmake +file path=usr/share/cmake-2.8/Modules/FindosgText.cmake +file path=usr/share/cmake-2.8/Modules/FindosgUtil.cmake +file path=usr/share/cmake-2.8/Modules/FindosgViewer.cmake +file path=usr/share/cmake-2.8/Modules/FindosgVolume.cmake +file path=usr/share/cmake-2.8/Modules/FindosgWidget.cmake +file path=usr/share/cmake-2.8/Modules/Findosg_functions.cmake +file path=usr/share/cmake-2.8/Modules/FindwxWidgets.cmake +file path=usr/share/cmake-2.8/Modules/FindwxWindows.cmake +dir path=usr/share/cmake-2.8/Modules/FortranCInterface file path=usr/share/cmake-2.8/Modules/FortranCInterface.cmake -file path=usr/share/cmake-2.8/Modules/FortranCInterface/call_mod.f90 -file path=usr/share/cmake-2.8/Modules/FortranCInterface/call_sub.f file path=usr/share/cmake-2.8/Modules/FortranCInterface/CMakeLists.txt file path=usr/share/cmake-2.8/Modules/FortranCInterface/Detect.cmake file path=usr/share/cmake-2.8/Modules/FortranCInterface/Input.cmake.in file path=usr/share/cmake-2.8/Modules/FortranCInterface/Macro.h.in +file path=usr/share/cmake-2.8/Modules/FortranCInterface/Output.cmake.in +dir path=usr/share/cmake-2.8/Modules/FortranCInterface/Verify +file path=usr/share/cmake-2.8/Modules/FortranCInterface/Verify/CMakeLists.txt +file path=usr/share/cmake-2.8/Modules/FortranCInterface/Verify/VerifyC.c +file path=usr/share/cmake-2.8/Modules/FortranCInterface/Verify/VerifyCXX.cxx +file path=usr/share/cmake-2.8/Modules/FortranCInterface/Verify/VerifyFortran.f +file path=usr/share/cmake-2.8/Modules/FortranCInterface/Verify/main.c +file path=usr/share/cmake-2.8/Modules/FortranCInterface/call_mod.f90 +file path=usr/share/cmake-2.8/Modules/FortranCInterface/call_sub.f file path=usr/share/cmake-2.8/Modules/FortranCInterface/main.F -file path=usr/share/cmake-2.8/Modules/FortranCInterface/my_module_.c file path=usr/share/cmake-2.8/Modules/FortranCInterface/my_module.f90 +file path=usr/share/cmake-2.8/Modules/FortranCInterface/my_module_.c file path=usr/share/cmake-2.8/Modules/FortranCInterface/my_sub.f -file path=usr/share/cmake-2.8/Modules/FortranCInterface/mymodule_.c file path=usr/share/cmake-2.8/Modules/FortranCInterface/mymodule.f90 +file path=usr/share/cmake-2.8/Modules/FortranCInterface/mymodule_.c file path=usr/share/cmake-2.8/Modules/FortranCInterface/mysub.f -file path=usr/share/cmake-2.8/Modules/FortranCInterface/Output.cmake.in file path=usr/share/cmake-2.8/Modules/FortranCInterface/symbol.c.in -file path=usr/share/cmake-2.8/Modules/FortranCInterface/Verify/CMakeLists.txt -file path=usr/share/cmake-2.8/Modules/FortranCInterface/Verify/main.c -file path=usr/share/cmake-2.8/Modules/FortranCInterface/Verify/VerifyC.c -file path=usr/share/cmake-2.8/Modules/FortranCInterface/Verify/VerifyCXX.cxx -file path=usr/share/cmake-2.8/Modules/FortranCInterface/Verify/VerifyFortran.f +file path=usr/share/cmake-2.8/Modules/GNUInstallDirs.cmake file path=usr/share/cmake-2.8/Modules/GenerateExportHeader.cmake file path=usr/share/cmake-2.8/Modules/GetPrerequisites.cmake -file path=usr/share/cmake-2.8/Modules/GNUInstallDirs.cmake +file path=usr/share/cmake-2.8/Modules/ITKCompatibility.cmake file path=usr/share/cmake-2.8/Modules/InstallRequiredSystemLibraries.cmake +dir path=usr/share/cmake-2.8/Modules/IntelVSImplicitPath file path=usr/share/cmake-2.8/Modules/IntelVSImplicitPath/CMakeLists.txt file path=usr/share/cmake-2.8/Modules/IntelVSImplicitPath/detect.cmake file path=usr/share/cmake-2.8/Modules/IntelVSImplicitPath/hello.f -file path=usr/share/cmake-2.8/Modules/ITKCompatibility.cmake -file path=usr/share/cmake-2.8/Modules/kde3init_dummy.cpp.in file path=usr/share/cmake-2.8/Modules/KDE3Macros.cmake -file path=usr/share/cmake-2.8/Modules/kde3uic.cmake file path=usr/share/cmake-2.8/Modules/MacOSXBundleInfo.plist.in file path=usr/share/cmake-2.8/Modules/MacOSXFrameworkInfo.plist.in file path=usr/share/cmake-2.8/Modules/MacroAddFileDependencies.cmake file path=usr/share/cmake-2.8/Modules/NSIS.InstallOptions.ini.in file path=usr/share/cmake-2.8/Modules/NSIS.template.in +dir path=usr/share/cmake-2.8/Modules/Platform +file path=usr/share/cmake-2.8/Modules/Platform/AIX-GNU-ASM.cmake file path=usr/share/cmake-2.8/Modules/Platform/AIX-GNU-C.cmake file path=usr/share/cmake-2.8/Modules/Platform/AIX-GNU-CXX.cmake file path=usr/share/cmake-2.8/Modules/Platform/AIX-GNU-Fortran.cmake @@ -436,6 +478,7 @@ file path=usr/share/cmake-2.8/Modules/Platform/AIX-XL-CXX.cmake file path=usr/share/cmake-2.8/Modules/Platform/AIX-XL-Fortran.cmake file path=usr/share/cmake-2.8/Modules/Platform/AIX-XL.cmake file path=usr/share/cmake-2.8/Modules/Platform/AIX.cmake +file path=usr/share/cmake-2.8/Modules/Platform/BSDOS.cmake file path=usr/share/cmake-2.8/Modules/Platform/BeOS.cmake file path=usr/share/cmake-2.8/Modules/Platform/BlueGeneL.cmake file path=usr/share/cmake-2.8/Modules/Platform/BlueGeneP-base.cmake @@ -453,40 +496,42 @@ file path=usr/share/cmake-2.8/Modules/Platform/BlueGeneP-static-XL-C.cmake file path=usr/share/cmake-2.8/Modules/Platform/BlueGeneP-static-XL-CXX.cmake file path=usr/share/cmake-2.8/Modules/Platform/BlueGeneP-static-XL-Fortran.cmake file path=usr/share/cmake-2.8/Modules/Platform/BlueGeneP-static.cmake -file path=usr/share/cmake-2.8/Modules/Platform/BSDOS.cmake -file path=usr/share/cmake-2.8/Modules/Platform/Catamount.cmake -file path=usr/share/cmake-2.8/Modules/Platform/cl.cmake +file path=usr/share/cmake-2.8/Modules/Platform/CYGWIN-CXX.cmake file path=usr/share/cmake-2.8/Modules/Platform/CYGWIN-GNU-C.cmake file path=usr/share/cmake-2.8/Modules/Platform/CYGWIN-GNU-CXX.cmake file path=usr/share/cmake-2.8/Modules/Platform/CYGWIN-GNU-Fortran.cmake file path=usr/share/cmake-2.8/Modules/Platform/CYGWIN-GNU.cmake file path=usr/share/cmake-2.8/Modules/Platform/CYGWIN-windres.cmake file path=usr/share/cmake-2.8/Modules/Platform/CYGWIN.cmake +file path=usr/share/cmake-2.8/Modules/Platform/Catamount.cmake file path=usr/share/cmake-2.8/Modules/Platform/Darwin-Absoft-Fortran.cmake +file path=usr/share/cmake-2.8/Modules/Platform/Darwin-CXX.cmake +file path=usr/share/cmake-2.8/Modules/Platform/Darwin-Clang-C.cmake +file path=usr/share/cmake-2.8/Modules/Platform/Darwin-Clang-CXX.cmake +file path=usr/share/cmake-2.8/Modules/Platform/Darwin-Clang.cmake file path=usr/share/cmake-2.8/Modules/Platform/Darwin-GNU-C.cmake file path=usr/share/cmake-2.8/Modules/Platform/Darwin-GNU-CXX.cmake file path=usr/share/cmake-2.8/Modules/Platform/Darwin-GNU-Fortran.cmake file path=usr/share/cmake-2.8/Modules/Platform/Darwin-GNU.cmake -file path=usr/share/cmake-2.8/Modules/Platform/Darwin-icc.cmake -file path=usr/share/cmake-2.8/Modules/Platform/Darwin-icpc.cmake file path=usr/share/cmake-2.8/Modules/Platform/Darwin-NAG-Fortran.cmake file path=usr/share/cmake-2.8/Modules/Platform/Darwin-VisualAge-C.cmake file path=usr/share/cmake-2.8/Modules/Platform/Darwin-VisualAge-CXX.cmake file path=usr/share/cmake-2.8/Modules/Platform/Darwin-XL-C.cmake file path=usr/share/cmake-2.8/Modules/Platform/Darwin-XL-CXX.cmake +file path=usr/share/cmake-2.8/Modules/Platform/Darwin-icc.cmake +file path=usr/share/cmake-2.8/Modules/Platform/Darwin-icpc.cmake file path=usr/share/cmake-2.8/Modules/Platform/Darwin.cmake file path=usr/share/cmake-2.8/Modules/Platform/DragonFly.cmake -file path=usr/share/cmake-2.8/Modules/Platform/eCos.cmake file path=usr/share/cmake-2.8/Modules/Platform/FreeBSD.cmake -file path=usr/share/cmake-2.8/Modules/Platform/gas.cmake +file path=usr/share/cmake-2.8/Modules/Platform/GNU.cmake +file path=usr/share/cmake-2.8/Modules/Platform/GNUtoMS_lib.bat.in +file path=usr/share/cmake-2.8/Modules/Platform/GNUtoMS_lib.cmake file path=usr/share/cmake-2.8/Modules/Platform/Generic-ADSP-ASM.cmake file path=usr/share/cmake-2.8/Modules/Platform/Generic-ADSP-C.cmake -file path=usr/share/cmake-2.8/Modules/Platform/Generic-ADSP-Common.cmake file path=usr/share/cmake-2.8/Modules/Platform/Generic-ADSP-CXX.cmake +file path=usr/share/cmake-2.8/Modules/Platform/Generic-ADSP-Common.cmake file path=usr/share/cmake-2.8/Modules/Platform/Generic-SDCC-C.cmake file path=usr/share/cmake-2.8/Modules/Platform/Generic.cmake -file path=usr/share/cmake-2.8/Modules/Platform/GNU.cmake -file path=usr/share/cmake-2.8/Modules/Platform/Haiku.cmake file path=usr/share/cmake-2.8/Modules/Platform/HP-UX-GNU-C.cmake file path=usr/share/cmake-2.8/Modules/Platform/HP-UX-GNU-CXX.cmake file path=usr/share/cmake-2.8/Modules/Platform/HP-UX-GNU-Fortran.cmake @@ -497,13 +542,13 @@ file path=usr/share/cmake-2.8/Modules/Platform/HP-UX-HP-CXX.cmake file path=usr/share/cmake-2.8/Modules/Platform/HP-UX-HP-Fortran.cmake file path=usr/share/cmake-2.8/Modules/Platform/HP-UX-HP.cmake file path=usr/share/cmake-2.8/Modules/Platform/HP-UX.cmake +file path=usr/share/cmake-2.8/Modules/Platform/Haiku.cmake file path=usr/share/cmake-2.8/Modules/Platform/IRIX.cmake file path=usr/share/cmake-2.8/Modules/Platform/IRIX64.cmake -file path=usr/share/cmake-2.8/Modules/Platform/kFreeBSD.cmake file path=usr/share/cmake-2.8/Modules/Platform/Linux-Absoft-Fortran.cmake +file path=usr/share/cmake-2.8/Modules/Platform/Linux-CXX.cmake file path=usr/share/cmake-2.8/Modules/Platform/Linux-Clang-C.cmake file path=usr/share/cmake-2.8/Modules/Platform/Linux-Clang-CXX.cmake -file path=usr/share/cmake-2.8/Modules/Platform/Linux-como.cmake file path=usr/share/cmake-2.8/Modules/Platform/Linux-GNU-C.cmake file path=usr/share/cmake-2.8/Modules/Platform/Linux-GNU-CXX.cmake file path=usr/share/cmake-2.8/Modules/Platform/Linux-GNU-Fortran.cmake @@ -513,27 +558,29 @@ file path=usr/share/cmake-2.8/Modules/Platform/Linux-Intel-CXX.cmake file path=usr/share/cmake-2.8/Modules/Platform/Linux-Intel-Fortran.cmake file path=usr/share/cmake-2.8/Modules/Platform/Linux-Intel.cmake file path=usr/share/cmake-2.8/Modules/Platform/Linux-NAG-Fortran.cmake -file path=usr/share/cmake-2.8/Modules/Platform/Linux-PathScale-C.cmake -file path=usr/share/cmake-2.8/Modules/Platform/Linux-PathScale-CXX.cmake -file path=usr/share/cmake-2.8/Modules/Platform/Linux-PathScale-Fortran.cmake -file path=usr/share/cmake-2.8/Modules/Platform/Linux-PathScale.cmake file path=usr/share/cmake-2.8/Modules/Platform/Linux-PGI-C.cmake file path=usr/share/cmake-2.8/Modules/Platform/Linux-PGI-CXX.cmake file path=usr/share/cmake-2.8/Modules/Platform/Linux-PGI-Fortran.cmake file path=usr/share/cmake-2.8/Modules/Platform/Linux-PGI.cmake +file path=usr/share/cmake-2.8/Modules/Platform/Linux-PathScale-C.cmake +file path=usr/share/cmake-2.8/Modules/Platform/Linux-PathScale-CXX.cmake +file path=usr/share/cmake-2.8/Modules/Platform/Linux-PathScale-Fortran.cmake +file path=usr/share/cmake-2.8/Modules/Platform/Linux-PathScale.cmake file path=usr/share/cmake-2.8/Modules/Platform/Linux-SunPro-CXX.cmake +file path=usr/share/cmake-2.8/Modules/Platform/Linux-TinyCC-C.cmake file path=usr/share/cmake-2.8/Modules/Platform/Linux-VisualAge-C.cmake file path=usr/share/cmake-2.8/Modules/Platform/Linux-VisualAge-CXX.cmake file path=usr/share/cmake-2.8/Modules/Platform/Linux-VisualAge-Fortran.cmake file path=usr/share/cmake-2.8/Modules/Platform/Linux-XL-C.cmake file path=usr/share/cmake-2.8/Modules/Platform/Linux-XL-CXX.cmake file path=usr/share/cmake-2.8/Modules/Platform/Linux-XL-Fortran.cmake +file path=usr/share/cmake-2.8/Modules/Platform/Linux-como.cmake file path=usr/share/cmake-2.8/Modules/Platform/Linux.cmake file path=usr/share/cmake-2.8/Modules/Platform/MP-RAS.cmake file path=usr/share/cmake-2.8/Modules/Platform/NetBSD.cmake +file path=usr/share/cmake-2.8/Modules/Platform/OSF1.cmake file path=usr/share/cmake-2.8/Modules/Platform/OpenBSD.cmake file path=usr/share/cmake-2.8/Modules/Platform/OpenVMS.cmake -file path=usr/share/cmake-2.8/Modules/Platform/OSF1.cmake file path=usr/share/cmake-2.8/Modules/Platform/QNX.cmake file path=usr/share/cmake-2.8/Modules/Platform/RISCos.cmake file path=usr/share/cmake-2.8/Modules/Platform/SCO_SV.cmake @@ -543,7 +590,6 @@ file path=usr/share/cmake-2.8/Modules/Platform/SunOS-GNU-CXX.cmake file path=usr/share/cmake-2.8/Modules/Platform/SunOS-GNU-Fortran.cmake file path=usr/share/cmake-2.8/Modules/Platform/SunOS-GNU.cmake file path=usr/share/cmake-2.8/Modules/Platform/SunOS.cmake -file path=usr/share/cmake-2.8/Modules/Platform/syllable.cmake file path=usr/share/cmake-2.8/Modules/Platform/Tru64.cmake file path=usr/share/cmake-2.8/Modules/Platform/ULTRIX.cmake file path=usr/share/cmake-2.8/Modules/Platform/UNIX_SV.cmake @@ -551,13 +597,16 @@ file path=usr/share/cmake-2.8/Modules/Platform/UnixPaths.cmake file path=usr/share/cmake-2.8/Modules/Platform/UnixWare.cmake file path=usr/share/cmake-2.8/Modules/Platform/Windows-Borland-C.cmake file path=usr/share/cmake-2.8/Modules/Platform/Windows-Borland-CXX.cmake -file path=usr/share/cmake-2.8/Modules/Platform/Windows-Borland.cmake -file path=usr/share/cmake-2.8/Modules/Platform/Windows-cl.cmake -file path=usr/share/cmake-2.8/Modules/Platform/Windows-cl.cmake.in -file path=usr/share/cmake-2.8/Modules/Platform/Windows-df.cmake +file path=usr/share/cmake-2.8/Modules/Platform/Windows-CXX.cmake +file path=usr/share/cmake-2.8/Modules/Platform/Windows-Embarcadero-C.cmake +file path=usr/share/cmake-2.8/Modules/Platform/Windows-Embarcadero-CXX.cmake +file path=usr/share/cmake-2.8/Modules/Platform/Windows-Embarcadero.cmake file path=usr/share/cmake-2.8/Modules/Platform/Windows-G95-Fortran.cmake +file path=usr/share/cmake-2.8/Modules/Platform/Windows-GNU-C-ABI.cmake file path=usr/share/cmake-2.8/Modules/Platform/Windows-GNU-C.cmake +file path=usr/share/cmake-2.8/Modules/Platform/Windows-GNU-CXX-ABI.cmake file path=usr/share/cmake-2.8/Modules/Platform/Windows-GNU-CXX.cmake +file path=usr/share/cmake-2.8/Modules/Platform/Windows-GNU-Fortran-ABI.cmake file path=usr/share/cmake-2.8/Modules/Platform/Windows-GNU-Fortran.cmake file path=usr/share/cmake-2.8/Modules/Platform/Windows-GNU.cmake file path=usr/share/cmake-2.8/Modules/Platform/Windows-Intel-ASM.cmake @@ -565,18 +614,31 @@ file path=usr/share/cmake-2.8/Modules/Platform/Windows-Intel-C.cmake file path=usr/share/cmake-2.8/Modules/Platform/Windows-Intel-CXX.cmake file path=usr/share/cmake-2.8/Modules/Platform/Windows-Intel-Fortran.cmake file path=usr/share/cmake-2.8/Modules/Platform/Windows-Intel.cmake +file path=usr/share/cmake-2.8/Modules/Platform/Windows-MSVC-C.cmake +file path=usr/share/cmake-2.8/Modules/Platform/Windows-MSVC-CXX.cmake +file path=usr/share/cmake-2.8/Modules/Platform/Windows-MSVC.cmake file path=usr/share/cmake-2.8/Modules/Platform/Windows-NMcl.cmake +file path=usr/share/cmake-2.8/Modules/Platform/Windows-df.cmake file path=usr/share/cmake-2.8/Modules/Platform/Windows-wcl386.cmake file path=usr/share/cmake-2.8/Modules/Platform/Windows-windres.cmake file path=usr/share/cmake-2.8/Modules/Platform/Windows.cmake +file path=usr/share/cmake-2.8/Modules/Platform/WindowsCE-MSVC-C.cmake +file path=usr/share/cmake-2.8/Modules/Platform/WindowsCE-MSVC-CXX.cmake +file path=usr/share/cmake-2.8/Modules/Platform/WindowsCE-MSVC.cmake +file path=usr/share/cmake-2.8/Modules/Platform/WindowsCE.cmake file path=usr/share/cmake-2.8/Modules/Platform/WindowsPaths.cmake file path=usr/share/cmake-2.8/Modules/Platform/Xenix.cmake +file path=usr/share/cmake-2.8/Modules/Platform/eCos.cmake +file path=usr/share/cmake-2.8/Modules/Platform/gas.cmake +file path=usr/share/cmake-2.8/Modules/Platform/kFreeBSD.cmake +file path=usr/share/cmake-2.8/Modules/Platform/syllable.cmake file path=usr/share/cmake-2.8/Modules/ProcessorCount.cmake file path=usr/share/cmake-2.8/Modules/Qt4ConfigDependentSettings.cmake file path=usr/share/cmake-2.8/Modules/Qt4Macros.cmake -file path=usr/share/cmake-2.8/Modules/readme.txt file path=usr/share/cmake-2.8/Modules/RepositoryInfo.txt.in file path=usr/share/cmake-2.8/Modules/SelectLibraryConfigurations.cmake +file path=usr/share/cmake-2.8/Modules/Squish4RunTestCase.bat +file path=usr/share/cmake-2.8/Modules/Squish4RunTestCase.sh file path=usr/share/cmake-2.8/Modules/SquishRunTestCase.bat file path=usr/share/cmake-2.8/Modules/SquishRunTestCase.sh file path=usr/share/cmake-2.8/Modules/SquishTestScript.cmake @@ -586,14 +648,13 @@ file path=usr/share/cmake-2.8/Modules/TestBigEndian.cmake file path=usr/share/cmake-2.8/Modules/TestCXXAcceptsFlag.cmake file path=usr/share/cmake-2.8/Modules/TestEndianess.c.in file path=usr/share/cmake-2.8/Modules/TestForANSIForScope.cmake -file path=usr/share/cmake-2.8/Modules/TestForAnsiForScope.cxx file path=usr/share/cmake-2.8/Modules/TestForANSIStreamHeaders.cmake file path=usr/share/cmake-2.8/Modules/TestForANSIStreamHeaders.cxx +file path=usr/share/cmake-2.8/Modules/TestForAnsiForScope.cxx file path=usr/share/cmake-2.8/Modules/TestForSSTREAM.cmake file path=usr/share/cmake-2.8/Modules/TestForSSTREAM.cxx file path=usr/share/cmake-2.8/Modules/TestForSTDNamespace.cmake file path=usr/share/cmake-2.8/Modules/TestForSTDNamespace.cxx -file path=usr/share/cmake-2.8/Modules/Use_wxWindows.cmake file path=usr/share/cmake-2.8/Modules/UseEcos.cmake file path=usr/share/cmake-2.8/Modules/UseJava.cmake file path=usr/share/cmake-2.8/Modules/UseJavaClassFilelist.cmake @@ -604,9 +665,17 @@ file path=usr/share/cmake-2.8/Modules/UseSWIG.cmake file path=usr/share/cmake-2.8/Modules/UseVTK40.cmake file path=usr/share/cmake-2.8/Modules/UseVTKBuildSettings40.cmake file path=usr/share/cmake-2.8/Modules/UseVTKConfig40.cmake +file path=usr/share/cmake-2.8/Modules/Use_wxWindows.cmake file path=usr/share/cmake-2.8/Modules/UsewxWidgets.cmake file path=usr/share/cmake-2.8/Modules/VTKCompatibility.cmake +file path=usr/share/cmake-2.8/Modules/WIX.template.in file path=usr/share/cmake-2.8/Modules/WriteBasicConfigVersionFile.cmake +file path=usr/share/cmake-2.8/Modules/ecos_clean.cmake +file path=usr/share/cmake-2.8/Modules/exportheader.cmake.in +file path=usr/share/cmake-2.8/Modules/kde3init_dummy.cpp.in +file path=usr/share/cmake-2.8/Modules/kde3uic.cmake +file path=usr/share/cmake-2.8/Modules/readme.txt +dir path=usr/share/cmake-2.8/Templates file path=usr/share/cmake-2.8/Templates/AppleInfo.plist file path=usr/share/cmake-2.8/Templates/CMakeVSMacros1.vsmacros file path=usr/share/cmake-2.8/Templates/CMakeVSMacros2.vsmacros @@ -627,31 +696,54 @@ file path=usr/share/cmake-2.8/Templates/UtilityHeader.dsptemplate file path=usr/share/cmake-2.8/Templates/cygwin-package.sh.in file path=usr/share/cmake-2.8/Templates/staticLibFooter.dsptemplate file path=usr/share/cmake-2.8/Templates/staticLibHeader.dsptemplate -file path=usr/share/cmake-2.8/doc/ccmake.docbook -file path=usr/share/cmake-2.8/doc/ccmake.html -file path=usr/share/cmake-2.8/doc/ccmake.txt -file path=usr/share/cmake-2.8/doc/cmake-commands.html -file path=usr/share/cmake-2.8/doc/cmake-commands.txt -file path=usr/share/cmake-2.8/doc/cmake-compatcommands.html -file path=usr/share/cmake-2.8/doc/cmake-compatcommands.txt -file path=usr/share/cmake-2.8/doc/cmake-modules.html -file path=usr/share/cmake-2.8/doc/cmake-modules.txt -file path=usr/share/cmake-2.8/doc/cmake-policies.html -file path=usr/share/cmake-2.8/doc/cmake-policies.txt -file path=usr/share/cmake-2.8/doc/cmake-properties.html -file path=usr/share/cmake-2.8/doc/cmake-properties.txt -file path=usr/share/cmake-2.8/doc/cmake-variables.html -file path=usr/share/cmake-2.8/doc/cmake-variables.txt -file path=usr/share/cmake-2.8/doc/cmake.docbook -file path=usr/share/cmake-2.8/doc/cmake.html -file path=usr/share/cmake-2.8/doc/cmake.txt -file path=usr/share/cmake-2.8/doc/cpack.docbook -file path=usr/share/cmake-2.8/doc/cpack.html -file path=usr/share/cmake-2.8/doc/cpack.txt -file path=usr/share/cmake-2.8/doc/ctest.docbook -file path=usr/share/cmake-2.8/doc/ctest.html -file path=usr/share/cmake-2.8/doc/ctest.txt +dir path=usr/share/cmake-2.8/completions +file path=usr/share/cmake-2.8/completions/cmake +file path=usr/share/cmake-2.8/completions/cpack +file path=usr/share/cmake-2.8/completions/ctest +dir path=usr/share/cmake-2.8/editors +dir path=usr/share/cmake-2.8/editors/emacs +file path=usr/share/cmake-2.8/editors/emacs/cmake-mode.el +dir path=usr/share/cmake-2.8/editors/vim +file path=usr/share/cmake-2.8/editors/vim/cmake-help.vim +file path=usr/share/cmake-2.8/editors/vim/cmake-indent.vim +file path=usr/share/cmake-2.8/editors/vim/cmake-syntax.vim +dir path=usr/share/cmake-2.8/include file path=usr/share/cmake-2.8/include/cmCPluginAPI.h +dir path=usr/share/doc +dir path=usr/share/doc/cmake-2.8 +file path=usr/share/doc/cmake-2.8/Copyright.txt +file path=usr/share/doc/cmake-2.8/ccmake.docbook +file path=usr/share/doc/cmake-2.8/ccmake.html +file path=usr/share/doc/cmake-2.8/ccmake.txt +file path=usr/share/doc/cmake-2.8/cmake-commands.html +file path=usr/share/doc/cmake-2.8/cmake-commands.txt +file path=usr/share/doc/cmake-2.8/cmake-compatcommands.html +file path=usr/share/doc/cmake-2.8/cmake-compatcommands.txt +file path=usr/share/doc/cmake-2.8/cmake-modules.html +file path=usr/share/doc/cmake-2.8/cmake-modules.txt +file path=usr/share/doc/cmake-2.8/cmake-policies.html +file path=usr/share/doc/cmake-2.8/cmake-policies.txt +file path=usr/share/doc/cmake-2.8/cmake-properties.html +file path=usr/share/doc/cmake-2.8/cmake-properties.txt +file path=usr/share/doc/cmake-2.8/cmake-variables.html +file path=usr/share/doc/cmake-2.8/cmake-variables.txt +file path=usr/share/doc/cmake-2.8/cmake.docbook +file path=usr/share/doc/cmake-2.8/cmake.html +file path=usr/share/doc/cmake-2.8/cmake.txt +dir path=usr/share/doc/cmake-2.8/cmcompress +file path=usr/share/doc/cmake-2.8/cmcompress/Copyright.txt +dir path=usr/share/doc/cmake-2.8/cmlibarchive +file path=usr/share/doc/cmake-2.8/cmlibarchive/COPYING +dir path=usr/share/doc/cmake-2.8/cmsys +file path=usr/share/doc/cmake-2.8/cmsys/Copyright.txt +file path=usr/share/doc/cmake-2.8/cpack.docbook +file path=usr/share/doc/cmake-2.8/cpack.html +file path=usr/share/doc/cmake-2.8/cpack.txt +file path=usr/share/doc/cmake-2.8/ctest.docbook +file path=usr/share/doc/cmake-2.8/ctest.html +file path=usr/share/doc/cmake-2.8/ctest.txt +dir path=usr/share/man +dir path=usr/share/man/man1 file path=usr/share/man/man1/ccmake.1 file path=usr/share/man/man1/cmake.1 file path=usr/share/man/man1/cmakecommands.1 @@ -662,5 +754,3 @@ file path=usr/share/man/man1/cmakeprops.1 file path=usr/share/man/man1/cmakevars.1 file path=usr/share/man/man1/cpack.1 file path=usr/share/man/man1/ctest.1 - -license cmake.license license="BSD, MIT, GPLv2, Curl, PD" diff --git a/components/cmake/patches/cmake-2.8.6.patch b/components/cmake/patches/cmake-2.8.6.patch dissimilarity index 72% index 6469d5219..97dd90888 100644 --- a/components/cmake/patches/cmake-2.8.6.patch +++ b/components/cmake/patches/cmake-2.8.6.patch @@ -1,1406 +1,710 @@ -diff -ru cmake-2.8.6.org//Modules/CMakeDetermineJavaCompiler.cmake cmake-2.8.6/Modules/CMakeDetermineJavaCompiler.cmake ---- cmake-2.8.6.org//Modules/CMakeDetermineJavaCompiler.cmake Tue Oct 4 09:09:24 2011 -+++ cmake-2.8.6/Modules/CMakeDetermineJavaCompiler.cmake Mon Oct 10 13:44:03 2011 -@@ -55,9 +55,10 @@ - /usr/bin - /usr/lib/java/bin - /usr/share/java/bin -- /usr/local/bin -- /usr/local/java/bin -- /usr/local/java/share/bin -+# Uncomment the following to enable /usr/local search -+# /usr/local/bin -+# /usr/local/java/bin -+# /usr/local/java/share/bin - /usr/java/j2sdk1.4.2_04 - /usr/lib/j2sdk1.4-sun/bin - /usr/java/j2sdk1.4.2_09/bin -diff -ru cmake-2.8.6.org//Modules/CMakeDetermineSystem.cmake cmake-2.8.6/Modules/CMakeDetermineSystem.cmake ---- cmake-2.8.6.org//Modules/CMakeDetermineSystem.cmake Tue Oct 4 09:09:24 2011 -+++ cmake-2.8.6/Modules/CMakeDetermineSystem.cmake Mon Oct 10 13:47:49 2011 -@@ -43,7 +43,9 @@ - - # find out on which system cmake runs - IF(CMAKE_HOST_UNIX) -- FIND_PROGRAM(CMAKE_UNAME uname /bin /usr/bin /usr/local/bin ) -+FIND_PROGRAM(CMAKE_UNAME uname /bin /usr/bin ) -+# Uncomment the following to enable /usr/local search -+# FIND_PROGRAM(CMAKE_UNAME uname /bin /usr/bin /usr/local/bin ) - IF(CMAKE_UNAME) - EXEC_PROGRAM(uname ARGS -s OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_NAME) - EXEC_PROGRAM(uname ARGS -r OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_VERSION) -diff -ru cmake-2.8.6.org//Modules/FindBLAS.cmake cmake-2.8.6/Modules/FindBLAS.cmake ---- cmake-2.8.6.org//Modules/FindBLAS.cmake Tue Oct 4 09:09:24 2011 -+++ cmake-2.8.6/Modules/FindBLAS.cmake Mon Oct 10 16:55:05 2011 -@@ -80,9 +80,13 @@ - if (WIN32) - set(_libdir ENV LIB) - elseif (APPLE) -- set(_libdir /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV DYLD_LIBRARY_PATH) -+ set(_libdir /usr/lib /usr/lib64 ENV DYLD_LIBRARY_PATH) -+# Uncomment the following to enable /usr/local search -+# set(_libdir /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV DYLD_LIBRARY_PATH) - else () -- set(_libdir /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV LD_LIBRARY_PATH) -+ set(_libdir /usr/lib /usr/lib64 ENV LD_LIBRARY_PATH) -+# Uncomment the following to enable /usr/local search -+# set(_libdir /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV LD_LIBRARY_PATH) - endif () - endif () - foreach(_library ${_list}) -diff -ru cmake-2.8.6.org//Modules/FindFLTK.cmake cmake-2.8.6/Modules/FindFLTK.cmake ---- cmake-2.8.6.org//Modules/FindFLTK.cmake Tue Oct 4 09:09:24 2011 -+++ cmake-2.8.6/Modules/FindFLTK.cmake Tue Oct 11 11:54:22 2011 -@@ -103,11 +103,15 @@ - ${FLTK_DIR_SEARCH} - - # Look in standard UNIX install locations. -- /usr/local/lib/fltk -+ -+# Uncomment the following to enable /usr/local search -+# /usr/local/lib/fltk - /usr/lib/fltk -- /usr/local/include -+# Uncomment the following to enable /usr/local search -+# /usr/local/include - /usr/include -- /usr/local/fltk -+# Uncomment the following to enable /usr/local search -+# /usr/local/fltk - /usr/X11R6/include - - # Read from the CMakeSetup registry entries. It is likely that -@@ -221,7 +225,8 @@ - ENDIF() - - SET(FLTK_INCLUDE_SEARCH_PATH ${FLTK_INCLUDE_SEARCH_PATH} -- /usr/local/fltk -+# Uncomment the following to enable /usr/local search -+# /usr/local/fltk - /usr/X11R6/include - ${_FLTK_POSSIBLE_INCLUDE_DIRS} - ) -@@ -242,7 +247,8 @@ - ENDIF() - - SET(FLTK_LIBRARY_SEARCH_PATH ${FLTK_LIBRARY_SEARCH_PATH} -- /usr/local/fltk/lib -+# Uncomment the following to enable /usr/local search -+# /usr/local/fltk/lib - /usr/X11R6/lib - ${FLTK_INCLUDE_DIR}/lib - ${_FLTK_POSSIBLE_LIBRARY_DIR} -diff -ru cmake-2.8.6.org//Modules/FindFLTK2.cmake cmake-2.8.6/Modules/FindFLTK2.cmake ---- cmake-2.8.6.org//Modules/FindFLTK2.cmake Tue Oct 4 09:09:24 2011 -+++ cmake-2.8.6/Modules/FindFLTK2.cmake Mon Oct 10 16:48:15 2011 -@@ -83,11 +83,15 @@ - ${FLTK2_DIR_SEARCH} - - # Look in standard UNIX install locations. -- /usr/local/lib/fltk2 -+ -+# Uncomment the following to enable /usr/local search -+# /usr/local/lib/fltk2 - /usr/lib/fltk2 -- /usr/local/include -+# Uncomment the following to enable /usr/local search -+# /usr/local/include - /usr/include -- /usr/local/fltk2 -+# Uncomment the following to enable /usr/local search -+# /usr/local/fltk2 - /usr/X11R6/include - - # Read from the CMakeSetup registry entries. It is likely that -@@ -193,9 +197,11 @@ - ENDIF(FLTK2_FLUID_EXECUTABLE) - - SET(FLTK2_INCLUDE_SEARCH_PATH ${FLTK2_INCLUDE_SEARCH_PATH} -- /usr/local/include -+# Uncomment the following to enable /usr/local search -+# /usr/local/include - /usr/include -- /usr/local/fltk2 -+# Uncomment the following to enable /usr/local search -+# /usr/local/fltk2 - /usr/X11R6/include - ) - -@@ -203,8 +209,9 @@ - - SET(FLTK2_LIBRARY_SEARCH_PATH ${FLTK2_LIBRARY_SEARCH_PATH} - /usr/lib -- /usr/local/lib -- /usr/local/fltk2/lib -+# Uncomment the following to enable /usr/local search -+# /usr/local/lib -+# /usr/local/fltk2/lib - /usr/X11R6/lib - ${FLTK2_INCLUDE_DIR}/lib - ) -diff -ru cmake-2.8.6.org//Modules/FindFreetype.cmake cmake-2.8.6/Modules/FindFreetype.cmake ---- cmake-2.8.6.org//Modules/FindFreetype.cmake Tue Oct 4 09:09:24 2011 -+++ cmake-2.8.6/Modules/FindFreetype.cmake Mon Oct 10 16:50:47 2011 -@@ -45,8 +45,9 @@ - HINTS - $ENV{FREETYPE_DIR} - PATHS -- /usr/local/X11R6/include -- /usr/local/X11/include -+# Uncomment the following to enable /usr/local search -+# /usr/local/X11R6/include -+# /usr/local/X11/include - /usr/freeware/include - ) - -@@ -54,8 +55,9 @@ - HINTS - $ENV{FREETYPE_DIR}/include/freetype2 - PATHS -- /usr/local/X11R6/include -- /usr/local/X11/include -+# Uncomment the following to enable /usr/local search -+# /usr/local/X11R6/include -+# /usr/local/X11/include - /usr/freeware/include - PATH_SUFFIXES freetype2 - ) -@@ -66,8 +68,9 @@ - $ENV{FREETYPE_DIR} - PATH_SUFFIXES lib64 lib - PATHS -- /usr/local/X11R6 -- /usr/local/X11 -+# Uncomment the following to enable /usr/local search -+# /usr/local/X11R6 -+# /usr/local/X11 - /usr/freeware - ) - -diff -ru cmake-2.8.6.org//Modules/FindGDAL.cmake cmake-2.8.6/Modules/FindGDAL.cmake ---- cmake-2.8.6.org//Modules/FindGDAL.cmake Tue Oct 4 09:09:24 2011 -+++ cmake-2.8.6/Modules/FindGDAL.cmake Mon Oct 10 16:52:52 2011 -@@ -53,7 +53,8 @@ - /Library/Frameworks/gdal.framework/Headers - /sw # Fink - /opt/local # DarwinPorts -- /opt/csw # Blastwave -+# Uncomment the following to enable /opt/csw search -+# /opt/csw # Blastwave - /opt - ) - -@@ -70,7 +71,8 @@ - PATHS - /sw # Fink - /opt/local # DarwinPorts -- /opt/csw # Blastwave -+# Uncomment the following to enable /opt/csw search -+# /opt/csw # Blastwave - /opt - ) - -@@ -95,7 +97,8 @@ - PATHS - /sw - /opt/local -- /opt/csw -+# Uncomment the following to enable /opt/csw search -+# /opt/csw - /opt - /usr/freeware - ) -diff -ru cmake-2.8.6.org//Modules/FindGTK.cmake cmake-2.8.6/Modules/FindGTK.cmake ---- cmake-2.8.6.org//Modules/FindGTK.cmake Tue Oct 4 09:09:24 2011 -+++ cmake-2.8.6/Modules/FindGTK.cmake Mon Oct 10 16:53:18 2011 -@@ -36,9 +36,11 @@ - FIND_PATH( GTK_glibconfig_INCLUDE_PATH NAMES glibconfig.h - PATHS - /usr/openwin/share/include -- /usr/local/include/glib12 -+# Uncomment the following to enable /usr/local search -+# /usr/local/include/glib12 - /usr/lib/glib/include -- /usr/local/lib/glib/include -+# Uncomment the following to enable /usr/local search -+# /usr/local/lib/glib/include - /opt/gnome/include - /opt/gnome/lib/glib/include - ) -diff -ru cmake-2.8.6.org//Modules/FindGTK2.cmake cmake-2.8.6/Modules/FindGTK2.cmake ---- cmake-2.8.6.org//Modules/FindGTK2.cmake Tue Oct 4 09:09:24 2011 -+++ cmake-2.8.6/Modules/FindGTK2.cmake Mon Oct 10 16:53:36 2011 -@@ -185,8 +185,9 @@ - - find_path(${_var} ${_hdr} - PATHS -- /usr/local/lib64 -- /usr/local/lib -+# Uncomment the following to enable /usr/local search -+# /usr/local/lib64 -+# /usr/local/lib - /usr/lib64 - /usr/lib - /opt/gnome/include -diff -ru cmake-2.8.6.org//Modules/FindJNI.cmake cmake-2.8.6/Modules/FindJNI.cmake ---- cmake-2.8.6.org//Modules/FindJNI.cmake Tue Oct 4 09:09:24 2011 -+++ cmake-2.8.6/Modules/FindJNI.cmake Mon Oct 10 16:54:47 2011 -@@ -102,12 +102,14 @@ - ${_JAVA_HOME}/lib - ${_JAVA_HOME} - /usr/lib -- /usr/local/lib -+# Uncomment the following to enable /usr/local search -+# /usr/local/lib - /usr/lib/jvm/java/lib - /usr/lib/java/jre/lib/{libarch} - /usr/lib/jvm/jre/lib/{libarch} -- /usr/local/lib/java/jre/lib/{libarch} -- /usr/local/share/java/jre/lib/{libarch} -+# Uncomment the following to enable /usr/local search -+# /usr/local/lib/java/jre/lib/{libarch} -+# /usr/local/share/java/jre/lib/{libarch} - /usr/lib/j2sdk1.4-sun/jre/lib/{libarch} - /usr/lib/j2sdk1.5-sun/jre/lib/{libarch} - /opt/sun-jdk-1.5.0.04/jre/lib/{libarch} -@@ -139,15 +141,18 @@ - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include" - ${_JAVA_HOME}/include - /usr/include -- /usr/local/include -+# Uncomment the following to enable /usr/local search -+# /usr/local/include - /usr/lib/java/include -- /usr/local/lib/java/include -+# Uncomment the following to enable /usr/local search -+# /usr/local/lib/java/include - /usr/lib/jvm/java/include - /usr/lib/jvm/java-6-sun/include - /usr/lib/jvm/java-1.5.0-sun/include - /usr/lib/jvm/java-6-sun-1.6.0.00/include # can this one be removed according to #8821 ? Alex - /usr/lib/jvm/java-6-openjdk/include -- /usr/local/share/java/include -+# Uncomment the following to enable /usr/local search -+# /usr/local/share/java/include - /usr/lib/j2sdk1.4-sun/include - /usr/lib/j2sdk1.5-sun/include - /opt/sun-jdk-1.5.0.04/include -diff -ru cmake-2.8.6.org//Modules/FindJava.cmake cmake-2.8.6/Modules/FindJava.cmake ---- cmake-2.8.6.org//Modules/FindJava.cmake Tue Oct 4 09:09:24 2011 -+++ cmake-2.8.6/Modules/FindJava.cmake Mon Oct 10 16:54:01 2011 -@@ -73,8 +73,9 @@ - SET(_JAVA_PATHS - /usr/lib/java/bin - /usr/share/java/bin -- /usr/local/java/bin -- /usr/local/java/share/bin -+# Uncomment the following to enable /usr/local search -+# /usr/local/java/bin -+# /usr/local/java/share/bin - /usr/java/j2sdk1.4.2_04 - /usr/lib/j2sdk1.4-sun/bin - /usr/java/j2sdk1.4.2_09/bin -diff -ru cmake-2.8.6.org//Modules/FindKDE3.cmake cmake-2.8.6/Modules/FindKDE3.cmake ---- cmake-2.8.6.org//Modules/FindKDE3.cmake Tue Oct 4 09:09:24 2011 -+++ cmake-2.8.6/Modules/FindKDE3.cmake Mon Oct 10 16:55:28 2011 -@@ -141,7 +141,8 @@ - /opt/kde3/include - /opt/kde/include - /usr/include/kde -- /usr/local/include/kde -+# Uncomment the following to enable /usr/local search -+# /usr/local/include/kde - ) - - #now the KDE library directory -diff -ru cmake-2.8.6.org//Modules/FindLAPACK.cmake cmake-2.8.6/Modules/FindLAPACK.cmake ---- cmake-2.8.6.org//Modules/FindLAPACK.cmake Tue Oct 4 09:09:24 2011 -+++ cmake-2.8.6/Modules/FindLAPACK.cmake Mon Oct 10 16:56:57 2011 -@@ -69,9 +69,13 @@ - if (WIN32) - set(_libdir ENV LIB) - elseif (APPLE) -- set(_libdir /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV DYLD_LIBRARY_PATH) -+ set(_libdir /usr/lib /usr/lib64 ENV DYLD_LIBRARY_PATH) -+# Uncomment the following to enable /usr/local search -+# set(_libdir /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV DYLD_LIBRARY_PATH) - else () -- set(_libdir /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV LD_LIBRARY_PATH) -+ set(_libdir /usr/lib /usr/lib64 ENV LD_LIBRARY_PATH) -+# Uncomment the following to enable /usr/local search -+# set(_libdir /usr/local/lib /usr/lib /usr/local/lib64 /usr/lib64 ENV LD_LIBRARY_PATH) - endif () - endif () - foreach(_library ${_list}) -diff -ru cmake-2.8.6.org//Modules/FindLua50.cmake cmake-2.8.6/Modules/FindLua50.cmake ---- cmake-2.8.6.org//Modules/FindLua50.cmake Tue Oct 4 09:09:24 2011 -+++ cmake-2.8.6/Modules/FindLua50.cmake Tue Oct 11 11:01:21 2011 -@@ -31,11 +31,13 @@ - PATHS - ~/Library/Frameworks - /Library/Frameworks -- /usr/local -+# Uncomment the following to enable /usr/local search -+# /usr/local - /usr - /sw # Fink - /opt/local # DarwinPorts -- /opt/csw # Blastwave -+# Uncomment the following to enable /opt/csw search -+# /opt/csw # Blastwave - /opt - ) - -@@ -43,15 +45,17 @@ - NAMES lua50 lua5.0 lua-5.0 lua5 lua - HINTS - $ENV{LUA_DIR} -- PATH_SUFFIXES lib64 lib -+ PATH_SUFFIXES lib64 lib lib/32 lib/64 - PATHS - ~/Library/Frameworks - /Library/Frameworks -- /usr/local -+# Uncomment the following to enable /usr/local search -+# /usr/local - /usr - /sw - /opt/local -- /opt/csw -+# Uncomment the following to enable /opt/csw search -+# /opt/csw - /opt - ) - -@@ -65,13 +69,15 @@ - HINTS - $ENV{LUALIB_DIR} - $ENV{LUA_DIR} -- PATH_SUFFIXES lib64 lib -+ PATH_SUFFIXES lib64 lib lib/32 lib/64 - PATHS -- /usr/local -+# Uncomment the following to enable /usr/local search -+# /usr/local - /usr - /sw - /opt/local -- /opt/csw -+# Uncomment the following to enable /opt/csw search -+# /opt/csw - /opt - ) - IF(LUA_LIBRARY_lualib AND LUA_LIBRARY_lua) -diff -ru cmake-2.8.6.org//Modules/FindLua51.cmake cmake-2.8.6/Modules/FindLua51.cmake ---- cmake-2.8.6.org//Modules/FindLua51.cmake Tue Oct 4 09:09:24 2011 -+++ cmake-2.8.6/Modules/FindLua51.cmake Tue Oct 11 11:05:48 2011 -@@ -31,11 +31,13 @@ - PATHS - ~/Library/Frameworks - /Library/Frameworks -- /usr/local -+# Uncomment the following to enable /usr/local search -+# /usr/local - /usr - /sw # Fink - /opt/local # DarwinPorts -- /opt/csw # Blastwave -+# Uncomment the following to enable /opt/csw search -+# /opt/csw # Blastwave - /opt - ) - -@@ -43,15 +45,17 @@ - NAMES lua51 lua5.1 lua-5.1 lua - HINTS - $ENV{LUA_DIR} -- PATH_SUFFIXES lib64 lib -+ PATH_SUFFIXES lib64 lib lib/32 lib/64 - PATHS - ~/Library/Frameworks - /Library/Frameworks -- /usr/local -+# Uncomment the following to enable /usr/local search -+# /usr/local - /usr - /sw - /opt/local -- /opt/csw -+# Uncomment the following to enable /opt/csw search -+# /opt/csw - /opt - ) - -diff -ru cmake-2.8.6.org//Modules/FindMatlab.cmake cmake-2.8.6/Modules/FindMatlab.cmake ---- cmake-2.8.6.org//Modules/FindMatlab.cmake Tue Oct 4 09:09:24 2011 -+++ cmake-2.8.6/Modules/FindMatlab.cmake Mon Oct 10 17:00:16 2011 -@@ -60,7 +60,8 @@ - IF(CMAKE_SIZEOF_VOID_P EQUAL 4) - # Regular x86 - SET(MATLAB_ROOT -- /usr/local/matlab-7sp1/bin/glnx86/ -+# Uncomment the following to enable /usr/local search -+# /usr/local/matlab-7sp1/bin/glnx86/ - /opt/matlab-7sp1/bin/glnx86/ - $ENV{HOME}/matlab-7sp1/bin/glnx86/ - $ENV{HOME}/redhat-matlab/bin/glnx86/ -@@ -68,7 +69,8 @@ - ELSE(CMAKE_SIZEOF_VOID_P EQUAL 4) - # AMD64: - SET(MATLAB_ROOT -- /usr/local/matlab-7sp1/bin/glnxa64/ -+# Uncomment the following to enable /usr/local search -+# /usr/local/matlab-7sp1/bin/glnxa64/ - /opt/matlab-7sp1/bin/glnxa64/ - $ENV{HOME}/matlab7_64/bin/glnxa64/ - $ENV{HOME}/matlab-7sp1/bin/glnxa64/ -@@ -89,7 +91,8 @@ - ) - FIND_PATH(MATLAB_INCLUDE_DIR - "mex.h" -- "/usr/local/matlab-7sp1/extern/include/" -+# Uncomment the following to enable /usr/local search -+# "/usr/local/matlab-7sp1/extern/include/" - "/opt/matlab-7sp1/extern/include/" - "$ENV{HOME}/matlab-7sp1/extern/include/" - "$ENV{HOME}/redhat-matlab/extern/include/" -diff -ru cmake-2.8.6.org//Modules/FindOpenAL.cmake cmake-2.8.6/Modules/FindOpenAL.cmake ---- cmake-2.8.6.org//Modules/FindOpenAL.cmake Tue Oct 4 09:09:24 2011 -+++ cmake-2.8.6/Modules/FindOpenAL.cmake Tue Oct 11 11:06:21 2011 -@@ -68,11 +68,13 @@ - PATHS - ~/Library/Frameworks - /Library/Frameworks -- /usr/local -+# Uncomment the following to enable /usr/local search -+# /usr/local - /usr - /sw # Fink - /opt/local # DarwinPorts -- /opt/csw # Blastwave -+# Uncomment the following to enable /opt/csw search -+# /opt/csw # Blastwave - /opt - [HKEY_LOCAL_MACHINE\\SOFTWARE\\Creative\ Labs\\OpenAL\ 1.1\ Software\ Development\ Kit\\1.00.0000;InstallDir] - ) -@@ -81,15 +83,17 @@ - NAMES OpenAL al openal OpenAL32 - HINTS - $ENV{OPENALDIR} -- PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64 -+ PATH_SUFFIXES lib64 lib lib/32 lib/64 libs64 libs libs/Win32 libs/Win64 - PATHS - ~/Library/Frameworks - /Library/Frameworks -- /usr/local -+# Uncomment the following to enable /usr/local search -+# /usr/local - /usr - /sw - /opt/local -- /opt/csw -+# Uncomment the following to enable /opt/csw search -+# /opt/csw - /opt - [HKEY_LOCAL_MACHINE\\SOFTWARE\\Creative\ Labs\\OpenAL\ 1.1\ Software\ Development\ Kit\\1.00.0000;InstallDir] - ) -diff -ru cmake-2.8.6.org//Modules/FindOpenThreads.cmake cmake-2.8.6/Modules/FindOpenThreads.cmake ---- cmake-2.8.6.org//Modules/FindOpenThreads.cmake Tue Oct 4 09:09:24 2011 -+++ cmake-2.8.6/Modules/FindOpenThreads.cmake Mon Oct 10 17:06:24 2011 -@@ -64,7 +64,8 @@ - PATHS - /sw # Fink - /opt/local # DarwinPorts -- /opt/csw # Blastwave -+# Uncomment the following to enable /opt/csw search -+# /opt/csw # Blastwave - /opt - /usr/freeware - PATH_SUFFIXES include -@@ -84,7 +85,8 @@ - PATHS - /sw - /opt/local -- /opt/csw -+# Uncomment the following to enable /opt/csw search -+# /opt/csw - /opt - /usr/freeware - PATH_SUFFIXES lib64 lib -@@ -104,7 +106,8 @@ - PATHS - /sw - /opt/local -- /opt/csw -+# Uncomment the following to enable /opt/csw search -+# /opt/csw - /opt - /usr/freeware - PATH_SUFFIXES lib64 lib -diff -ru cmake-2.8.6.org//Modules/FindPHP4.cmake cmake-2.8.6/Modules/FindPHP4.cmake ---- cmake-2.8.6.org//Modules/FindPHP4.cmake Tue Oct 4 09:09:24 2011 -+++ cmake-2.8.6/Modules/FindPHP4.cmake Mon Oct 10 17:07:51 2011 -@@ -22,10 +22,12 @@ - - SET(PHP4_POSSIBLE_INCLUDE_PATHS - /usr/include/php4 -- /usr/local/include/php4 -+# Uncomment the following to enable /usr/local search -+# /usr/local/include/php4 - /usr/include/php -- /usr/local/include/php -- /usr/local/apache/php -+# Uncomment the following to enable /usr/local search -+# /usr/local/include/php -+# /usr/local/apache/php - ) - - SET(PHP4_POSSIBLE_LIB_PATHS -diff -ru cmake-2.8.6.org//Modules/FindPhysFS.cmake cmake-2.8.6/Modules/FindPhysFS.cmake ---- cmake-2.8.6.org//Modules/FindPhysFS.cmake Tue Oct 4 09:09:24 2011 -+++ cmake-2.8.6/Modules/FindPhysFS.cmake Tue Oct 11 11:06:49 2011 -@@ -30,7 +30,8 @@ - PATHS - ~/Library/Frameworks - /Library/Frameworks -- /usr/local -+# Uncomment the following to enable /usr/local search -+# /usr/local - /usr - /sw # Fink - /opt/local # DarwinPorts -@@ -42,11 +43,12 @@ - NAMES physfs - HINTS - $ENV{PHYSFSDIR} -- PATH_SUFFIXES lib64 lib -+ PATH_SUFFIXES lib64 lib lib/32 lib/64 - PATHS - ~/Library/Frameworks - /Library/Frameworks -- /usr/local -+# Uncomment the following to enable /usr/local search -+# /usr/local - /usr - /sw - /opt/local -diff -ru cmake-2.8.6.org//Modules/FindPike.cmake cmake-2.8.6/Modules/FindPike.cmake ---- cmake-2.8.6.org//Modules/FindPike.cmake Tue Oct 4 09:09:24 2011 -+++ cmake-2.8.6/Modules/FindPike.cmake Mon Oct 10 17:09:13 2011 -@@ -22,7 +22,9 @@ - - FILE(GLOB PIKE_POSSIBLE_INCLUDE_PATHS - /usr/include/pike/* -- /usr/local/include/pike/*) -+# Uncomment the following to enable /usr/local search -+# /usr/local/include/pike/*) -+ ) - - FIND_PATH(PIKE_INCLUDE_PATH program.h - ${PIKE_POSSIBLE_INCLUDE_PATHS}) -diff -ru cmake-2.8.6.org//Modules/FindProducer.cmake cmake-2.8.6/Modules/FindProducer.cmake ---- cmake-2.8.6.org//Modules/FindProducer.cmake Tue Oct 4 09:09:24 2011 -+++ cmake-2.8.6/Modules/FindProducer.cmake Tue Oct 11 11:07:52 2011 -@@ -51,11 +51,13 @@ - PATHS - ~/Library/Frameworks - /Library/Frameworks -- /usr/local/include -+# Uncomment the following to enable /usr/local search -+# /usr/local/include - /usr/include - /sw/include # Fink - /opt/local/include # DarwinPorts -- /opt/csw/include # Blastwave -+# Uncomment the following to enable /opt/csw search -+# /opt/csw/include # Blastwave - /opt/include - [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OpenThreads_ROOT]/include - [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include -@@ -67,13 +69,15 @@ - $ENV{PRODUCER_DIR} - $ENV{OSG_DIR} - $ENV{OSGDIR} -- PATH_SUFFIXES lib64 lib -+ PATH_SUFFIXES lib64 lib lib/32 lib/64 - PATHS -- /usr/local -+# Uncomment the following to enable /usr/local search -+# /usr/local - /usr - /sw - /opt/local -- /opt/csw -+# Uncomment the following to enable /opt/csw search -+# /opt/csw - /opt - ) - -diff -ru cmake-2.8.6.org//Modules/FindQt.cmake cmake-2.8.6/Modules/FindQt.cmake ---- cmake-2.8.6.org//Modules/FindQt.cmake Tue Oct 4 09:09:24 2011 -+++ cmake-2.8.6/Modules/FindQt.cmake Tue Oct 11 10:08:04 2011 -@@ -82,8 +82,9 @@ - "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/include/Qt" - ${qt_headers}/Qt - $ENV{QTDIR}/include/Qt -- /usr/local/qt/include/Qt -- /usr/local/include/Qt -+# Uncomment the following to enable /usr/local search -+# /usr/local/qt/include/Qt -+# /usr/local/include/Qt - /usr/lib/qt/include/Qt - /usr/include/Qt - /usr/share/qt4/include/Qt -@@ -101,8 +102,9 @@ - C:/Qt/3.3.3Educational/include - $ENV{QTDIR}/include - /usr/include/qt3/Qt -- /usr/local/qt/include -- /usr/local/include -+# Uncomment the following to enable /usr/local search -+# /usr/local/qt/include -+# /usr/local/include - /usr/lib/qt/include - /usr/include - /usr/share/qt3/include -diff -ru cmake-2.8.6.org//Modules/FindQt3.cmake cmake-2.8.6/Modules/FindQt3.cmake ---- cmake-2.8.6.org//Modules/FindQt3.cmake Tue Oct 4 09:09:24 2011 -+++ cmake-2.8.6/Modules/FindQt3.cmake Tue Oct 11 10:08:58 2011 -@@ -53,7 +53,8 @@ - "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt" - $ENV{QTDIR}/include - ${GLOB_PATHS_BIN} -- /usr/local/qt/include -+# Uncomment the following to enable /usr/local search -+# /usr/local/qt/include - /usr/lib/qt/include - /usr/lib/qt3/include - /usr/include/qt -@@ -91,7 +92,8 @@ - "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/lib" - $ENV{QTDIR}/lib - ${GLOB_PATHS_LIB} -- /usr/local/qt/lib -+# Uncomment the following to enable /usr/local search -+# /usr/local/qt/lib - /usr/lib/qt/lib - /usr/lib/qt3/lib - /usr/lib/qt3/lib64 -@@ -111,7 +113,8 @@ - "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/lib" - $ENV{QTDIR}/lib - ${GLOB_PATHS_LIB} -- /usr/local/qt/lib -+# Uncomment the following to enable /usr/local search -+# /usr/local/qt/lib - /usr/lib/qt/lib - /usr/lib/qt3/lib - /usr/lib/qt3/lib64 -@@ -129,7 +132,8 @@ - "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/lib" - $ENV{QTDIR}/lib - ${GLOB_PATHS_LIB} -- /usr/local/qt/lib -+# Uncomment the following to enable /usr/local search -+# /usr/local/qt/lib - /usr/lib/qt3/lib - /usr/lib/qt3/lib64 - /usr/share/qt3/lib -@@ -147,7 +151,8 @@ - "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt" - $ENV{QTDIR}/bin - ${GLOB_PATHS_BIN} -- /usr/local/qt/bin -+# Uncomment the following to enable /usr/local search -+# /usr/local/qt/bin - /usr/lib/qt/bin - /usr/lib/qt3/bin - /usr/share/qt3/bin -@@ -169,7 +174,8 @@ - "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/include/Qt" - "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt" - ${GLOB_PATHS_BIN} -- /usr/local/qt/bin -+# Uncomment the following to enable /usr/local search -+# /usr/local/qt/bin - /usr/lib/qt/bin - /usr/lib/qt3/bin - /usr/share/qt3/bin -diff -ru cmake-2.8.6.org//Modules/FindSDL.cmake cmake-2.8.6/Modules/FindSDL.cmake ---- cmake-2.8.6.org//Modules/FindSDL.cmake Tue Oct 4 09:09:24 2011 -+++ cmake-2.8.6/Modules/FindSDL.cmake Tue Oct 11 10:09:48 2011 -@@ -72,13 +72,15 @@ - PATHS - ~/Library/Frameworks - /Library/Frameworks -- /usr/local/include/SDL12 -- /usr/local/include/SDL11 # FreeBSD ports -+# Uncomment the following to enable /usr/local search -+# /usr/local/include/SDL12 -+# /usr/local/include/SDL11 # FreeBSD ports - /usr/include/SDL12 - /usr/include/SDL11 - /sw # Fink - /opt/local # DarwinPorts -- /opt/csw # Blastwave -+# Uncomment the following to enable /usr/local search -+# /opt/csw # Blastwave - /opt - ) - #MESSAGE("SDL_INCLUDE_DIR is ${SDL_INCLUDE_DIR}") -@@ -93,7 +95,8 @@ - PATHS - /sw - /opt/local -- /opt/csw -+# Uncomment the following to enable /opt/csw search -+# /opt/csw - /opt - ) - -@@ -113,7 +116,8 @@ - PATHS - /sw - /opt/local -- /opt/csw -+# Uncomment the following to enable /opt/csw search -+# /opt/csw - /opt - ) - ENDIF(NOT ${SDL_INCLUDE_DIR} MATCHES ".framework") -diff -ru cmake-2.8.6.org//Modules/FindSDL_image.cmake cmake-2.8.6/Modules/FindSDL_image.cmake ---- cmake-2.8.6.org//Modules/FindSDL_image.cmake Tue Oct 4 09:09:24 2011 -+++ cmake-2.8.6/Modules/FindSDL_image.cmake Tue Oct 11 10:10:36 2011 -@@ -33,20 +33,24 @@ - PATHS - ~/Library/Frameworks - /Library/Frameworks -- /usr/local/include/SDL -+# Uncomment the following to enable /usr/local search -+# /usr/local/include/SDL - /usr/include/SDL -- /usr/local/include/SDL12 -- /usr/local/include/SDL11 # FreeBSD ports -+# Uncomment the following to enable /usr/local search -+# /usr/local/include/SDL12 -+# /usr/local/include/SDL11 # FreeBSD ports - /usr/include/SDL12 - /usr/include/SDL11 -- /usr/local/include -+# Uncomment the following to enable /usr/local search -+# /usr/local/include - /usr/include - /sw/include/SDL # Fink - /sw/include - /opt/local/include/SDL # DarwinPorts - /opt/local/include -- /opt/csw/include/SDL # Blastwave -- /opt/csw/include -+# Uncomment the following to enable /opt/csw search -+# /opt/csw/include/SDL # Blastwave -+# /opt/csw/include - /opt/include/SDL - /opt/include - ) -@@ -60,11 +64,13 @@ - PATHS - ~/Library/Frameworks - /Library/Frameworks -- /usr/local -+# Uncomment the following to enable /usr/local search -+# /usr/local - /usr - /sw - /opt/local -- /opt/csw -+# Uncomment the following to enable /opt/csw search -+# /opt/csw - /opt - ) - -diff -ru cmake-2.8.6.org//Modules/FindSDL_mixer.cmake cmake-2.8.6/Modules/FindSDL_mixer.cmake ---- cmake-2.8.6.org//Modules/FindSDL_mixer.cmake Tue Oct 4 09:09:24 2011 -+++ cmake-2.8.6/Modules/FindSDL_mixer.cmake Tue Oct 11 11:09:06 2011 -@@ -33,20 +33,24 @@ - PATHS - ~/Library/Frameworks - /Library/Frameworks -- /usr/local/include/SDL -+# Uncomment the following to enable /usr/local search -+# /usr/local/include/SDL - /usr/include/SDL -- /usr/local/include/SDL12 -- /usr/local/include/SDL11 # FreeBSD ports -+# Uncomment the following to enable /usr/local search -+# /usr/local/include/SDL12 -+# /usr/local/include/SDL11 # FreeBSD ports - /usr/include/SDL12 - /usr/include/SDL11 -- /usr/local/include -+# Uncomment the following to enable /usr/local search -+# /usr/local/include - /usr/include - /sw/include/SDL # Fink - /sw/include - /opt/local/include/SDL # DarwinPorts - /opt/local/include -- /opt/csw/include/SDL # Blastwave -- /opt/csw/include -+# Uncomment the following to enable /opt/csw search -+# /opt/csw/include/SDL # Blastwave -+# /opt/csw/include - /opt/include/SDL - /opt/include - ) -@@ -56,15 +60,17 @@ - HINTS - $ENV{SDLMIXERDIR} - $ENV{SDLDIR} -- PATH_SUFFIXES lib64 lib -+ PATH_SUFFIXES lib64 lib lib/32 lib/64 - PATHS - ~/Library/Frameworks - /Library/Frameworks -- /usr/local -+# Uncomment the following to enable /usr/local search -+# /usr/local - /usr - /sw - /opt/local -- /opt/csw -+# Uncomment the following to enable /opt/csw search -+# /opt/csw - /opt - ) - -diff -ru cmake-2.8.6.org//Modules/FindSDL_net.cmake cmake-2.8.6/Modules/FindSDL_net.cmake ---- cmake-2.8.6.org//Modules/FindSDL_net.cmake Tue Oct 4 09:09:24 2011 -+++ cmake-2.8.6/Modules/FindSDL_net.cmake Tue Oct 11 11:10:06 2011 -@@ -33,20 +33,24 @@ - PATHS - ~/Library/Frameworks - /Library/Frameworks -- /usr/local/include/SDL -+# Uncomment the following to enable /usr/local search -+# /usr/local/include/SDL - /usr/include/SDL -- /usr/local/include/SDL12 -- /usr/local/include/SDL11 # FreeBSD ports -+# Uncomment the following to enable /usr/local search -+# /usr/local/include/SDL12 -+# /usr/local/include/SDL11 # FreeBSD ports - /usr/include/SDL12 - /usr/include/SDL11 -- /usr/local/include -+# Uncomment the following to enable /usr/local search -+# /usr/local/include - /usr/include - /sw/include/SDL # Fink - /sw/include - /opt/local/include/SDL # DarwinPorts - /opt/local/include -- /opt/csw/include/SDL # Blastwave -- /opt/csw/include -+# Uncomment the following to enable /opt/csw search -+# /opt/csw/include/SDL # Blastwave -+# /opt/csw/include - /opt/include/SDL - /opt/include - ) -@@ -55,15 +59,17 @@ - HINTS - $ENV{SDLNETDIR} - $ENV{SDLDIR} -- PATH_SUFFIXES lib64 lib -+ PATH_SUFFIXES lib64 lib lib/32 lib/64 - PATHS - ~/Library/Frameworks - /Library/Frameworks -- /usr/local -+# Uncomment the following to enable /usr/local search -+# /usr/local - /usr - /sw - /opt/local -- /opt/csw -+# Uncomment the following to enable /opt/csw search -+# /opt/csw - /opt - ) - -diff -ru cmake-2.8.6.org//Modules/FindSDL_sound.cmake cmake-2.8.6/Modules/FindSDL_sound.cmake ---- cmake-2.8.6.org//Modules/FindSDL_sound.cmake Tue Oct 4 09:09:24 2011 -+++ cmake-2.8.6/Modules/FindSDL_sound.cmake Tue Oct 11 10:15:08 2011 -@@ -80,20 +80,24 @@ - $ENV{SDLDIR}/include - $ENV{SDLDIR} - PATHS -- /usr/local/include/SDL -+# Uncomment the following to enable /usr/local search -+# /usr/local/include/SDL - /usr/include/SDL -- /usr/local/include/SDL12 -- /usr/local/include/SDL11 # FreeBSD ports -+# Uncomment the following to enable /usr/local search -+# /usr/local/include/SDL12 -+# /usr/local/include/SDL11 # FreeBSD ports - /usr/include/SDL12 - /usr/include/SDL11 -- /usr/local/include -+# Uncomment the following to enable /usr/local search -+# /usr/local/include - /usr/include - /sw/include/SDL # Fink - /sw/include - /opt/local/include/SDL # DarwinPorts - /opt/local/include -- /opt/csw/include/SDL # Blastwave -- /opt/csw/include -+# Uncomment the following to enable /opt/csw search -+# /opt/csw/include/SDL # Blastwave -+# /opt/csw/include - /opt/include/SDL - /opt/include - ) -@@ -106,11 +110,13 @@ - $ENV{SDLDIR}/lib - $ENV{SDLDIR} - PATHS -- /usr/local/lib -+# Uncomment the following to enable /usr/local search -+# /usr/local/lib - /usr/lib - /sw/lib - /opt/local/lib -- /opt/csw/lib -+# Uncomment the following to enable /opt/csw search -+# /opt/csw/lib - /opt/lib - ) - -@@ -223,11 +229,13 @@ - $ENV{SDLSOUNDDIR} - $ENV{SDLDIR}/lib - $ENV{SDLDIR} -- /usr/local/lib -+# Uncomment the following to enable /usr/local search -+# /usr/local/lib - /usr/lib - /sw/lib - /opt/local/lib -- /opt/csw/lib -+# Uncomment the following to enable /opt/csw search -+# /opt/csw/lib - /opt/lib - ) - IF(MIKMOD_LIBRARY) -@@ -246,11 +254,13 @@ - $ENV{SDLSOUNDDIR} - $ENV{SDLDIR}/lib - $ENV{SDLDIR} -- /usr/local/lib -+# Uncomment the following to enable /usr/local search -+# /usr/local/lib - /usr/lib - /sw/lib - /opt/local/lib -- /opt/csw/lib -+# Uncomment the following to enable /opt/csw search -+# /opt/csw/lib - /opt/lib - ) - IF(MODPLUG_LIBRARY) -@@ -272,11 +282,13 @@ - $ENV{SDLSOUNDDIR} - $ENV{SDLDIR}/lib - $ENV{SDLDIR} -- /usr/local/lib -+# Uncomment the following to enable /usr/local search -+# /usr/local/lib - /usr/lib - /sw/lib - /opt/local/lib -- /opt/csw/lib -+# Uncomment the following to enable /opt/csw search -+# /opt/csw/lib - /opt/lib - ) - IF(VORBIS_LIBRARY) -@@ -294,11 +306,13 @@ - $ENV{SDLSOUNDDIR} - $ENV{SDLDIR}/lib - $ENV{SDLDIR} -- /usr/local/lib -+# Uncomment the following to enable /usr/local search -+# /usr/local/lib - /usr/lib - /sw/lib - /opt/local/lib -- /opt/csw/lib -+# Uncomment the following to enable /opt/csw search -+# /opt/csw/lib - /opt/lib - ) - IF(OGG_LIBRARY) -@@ -318,11 +332,13 @@ - $ENV{SDLSOUNDDIR} - $ENV{SDLDIR}/lib - $ENV{SDLDIR} -- /usr/local/lib -+# Uncomment the following to enable /usr/local search -+# /usr/local/lib - /usr/lib - /sw/lib - /opt/local/lib -- /opt/csw/lib -+# Uncomment the following to enable /opt/csw search -+# /opt/csw/lib - /opt/lib - ) - IF(SMPEG_LIBRARY) -@@ -342,11 +358,13 @@ - $ENV{SDLSOUNDDIR} - $ENV{SDLDIR}/lib - $ENV{SDLDIR} -- /usr/local/lib -+# Uncomment the following to enable /usr/local search -+# /usr/local/lib - /usr/lib - /sw/lib - /opt/local/lib -- /opt/csw/lib -+# Uncomment the following to enable /opt/csw search -+# /opt/csw/lib - /opt/lib - ) - IF(FLAC_LIBRARY) -@@ -369,11 +387,13 @@ - $ENV{SDLSOUNDDIR} - $ENV{SDLDIR}/lib - $ENV{SDLDIR} -- /usr/local/lib -+# Uncomment the following to enable /usr/local search -+# /usr/local/lib - /usr/lib - /sw/lib - /opt/local/lib -- /opt/csw/lib -+# Uncomment the following to enable /opt/csw search -+# /opt/csw/lib - /opt/lib - ) - IF(SPEEX_LIBRARY) -@@ -396,11 +416,13 @@ - $ENV{SDLSOUNDDIR} - $ENV{SDLDIR}/lib - $ENV{SDLDIR} -- /usr/local/lib -+# Uncomment the following to enable /usr/local search -+# /usr/local/lib - /usr/lib - /sw/lib - /opt/local/lib -- /opt/csw/lib -+# Uncomment the following to enable /opt/csw search -+# /opt/csw/lib - /opt/lib - ) - IF(OGG_LIBRARY) -diff -ru cmake-2.8.6.org//Modules/FindSDL_ttf.cmake cmake-2.8.6/Modules/FindSDL_ttf.cmake ---- cmake-2.8.6.org//Modules/FindSDL_ttf.cmake Tue Oct 4 09:09:24 2011 -+++ cmake-2.8.6/Modules/FindSDL_ttf.cmake Tue Oct 11 10:15:50 2011 -@@ -33,20 +33,24 @@ - PATHS - ~/Library/Frameworks - /Library/Frameworks -- /usr/local/include/SDL -+# Uncomment the following to enable /usr/local search -+# /usr/local/include/SDL - /usr/include/SDL -- /usr/local/include/SDL12 -- /usr/local/include/SDL11 # FreeBSD ports -+# Uncomment the following to enable /usr/local search -+# /usr/local/include/SDL12 -+# /usr/local/include/SDL11 # FreeBSD ports - /usr/include/SDL12 - /usr/include/SDL11 -- /usr/local/include -+# Uncomment the following to enable /usr/local search -+# /usr/local/include - /usr/include - /sw/include/SDL # Fink - /sw/include - /opt/local/include/SDL # DarwinPorts - /opt/local/include -- /opt/csw/include/SDL # Blastwave -- /opt/csw/include -+# Uncomment the following to enable /opt/csw search -+# /opt/csw/include/SDL # Blastwave -+# /opt/csw/include - /opt/include/SDL - /opt/include - ) -@@ -59,11 +63,13 @@ - PATHS - ~/Library/Frameworks - /Library/Frameworks -- /usr/local -+# Uncomment the following to enable /usr/local search -+# /usr/local - /usr - /sw - /opt/local -- /opt/csw -+# Uncomment the following to enable /opt/csw search -+# /opt/csw - /opt - PATH_SUFFIXES lib64 lib - ) -diff -ru cmake-2.8.6.org//Modules/FindSelfPackers.cmake cmake-2.8.6/Modules/FindSelfPackers.cmake ---- cmake-2.8.6.org//Modules/FindSelfPackers.cmake Tue Oct 4 09:09:24 2011 -+++ cmake-2.8.6/Modules/FindSelfPackers.cmake Tue Oct 11 10:16:10 2011 -@@ -25,7 +25,8 @@ - ${CYGWIN_INSTALL_PATH}/bin - /bin - /usr/bin -- /usr/local/bin -+# Uncomment the following to enable /usr/local search -+# /usr/local/bin - /sbin - ) - -@@ -34,7 +35,8 @@ - ${CYGWIN_INSTALL_PATH}/bin - /bin - /usr/bin -- /usr/local/bin -+# Uncomment the following to enable /usr/local search -+# /usr/local/bin - /sbin - ) - -diff -ru cmake-2.8.6.org//Modules/FindTCL.cmake cmake-2.8.6/Modules/FindTCL.cmake ---- cmake-2.8.6.org//Modules/FindTCL.cmake Tue Oct 4 09:09:24 2011 -+++ cmake-2.8.6/Modules/FindTCL.cmake Tue Oct 11 10:17:12 2011 -@@ -79,7 +79,8 @@ - "${TCL_TCLSH_PATH_PARENT}/lib" - "${TK_WISH_PATH_PARENT}/lib" - /usr/lib -- /usr/local/lib -+# Uncomment the following to enable /usr/local search -+# /usr/local/lib - ) - - IF(WIN32) -@@ -159,7 +160,8 @@ - "${TCL_TCLSH_PATH_PARENT}/include" - "${TK_WISH_PATH_PARENT}/include" - /usr/include -- /usr/local/include -+# Uncomment the following to enable /usr/local search -+# /usr/local/include - /usr/include/tcl${TK_LIBRARY_VERSION} - /usr/include/tcl${TCL_LIBRARY_VERSION} - /usr/include/tcl8.6 -diff -ru cmake-2.8.6.org//Modules/FindTclStub.cmake cmake-2.8.6/Modules/FindTclStub.cmake ---- cmake-2.8.6.org//Modules/FindTclStub.cmake Tue Oct 4 09:09:24 2011 -+++ cmake-2.8.6/Modules/FindTclStub.cmake Tue Oct 11 10:17:24 2011 -@@ -67,7 +67,8 @@ - "${TCL_TCLSH_PATH_PARENT}/lib" - "${TK_WISH_PATH_PARENT}/lib" - /usr/lib -- /usr/local/lib -+# Uncomment the following to enable /usr/local search -+# /usr/local/lib - ) - - IF(WIN32) -diff -ru cmake-2.8.6.org//Modules/FindUnixCommands.cmake cmake-2.8.6/Modules/FindUnixCommands.cmake ---- cmake-2.8.6.org//Modules/FindUnixCommands.cmake Tue Oct 4 09:09:24 2011 -+++ cmake-2.8.6/Modules/FindUnixCommands.cmake Tue Oct 11 10:17:56 2011 -@@ -22,7 +22,8 @@ - ${CYGWIN_INSTALL_PATH}/bin - /bin - /usr/bin -- /usr/local/bin -+# Uncomment the following to enable /usr/local search -+# /usr/local/bin - /sbin - ) - MARK_AS_ADVANCED( -@@ -34,7 +35,8 @@ - ${CYGWIN_INSTALL_PATH}/bin - /bin - /usr/bin -- /usr/local/bin -+# Uncomment the following to enable /usr/local search -+# /usr/local/bin - /sbin - ) - MARK_AS_ADVANCED( -@@ -46,7 +48,8 @@ - ${CYGWIN_INSTALL_PATH}/bin - /bin - /usr/bin -- /usr/local/bin -+# Uncomment the following to enable /usr/local search -+# /usr/local/bin - /sbin - ) - MARK_AS_ADVANCED( -@@ -58,7 +61,8 @@ - ${CYGWIN_INSTALL_PATH}/bin - /bin - /usr/bin -- /usr/local/bin -+# Uncomment the following to enable /usr/local search -+# /usr/local/bin - /sbin - ) - MARK_AS_ADVANCED( -@@ -70,7 +74,8 @@ - ${CYGWIN_INSTALL_PATH}/bin - /bin - /usr/bin -- /usr/local/bin -+# Uncomment the following to enable /usr/local search -+# /usr/local/bin - /sbin - ) - MARK_AS_ADVANCED( -@@ -85,7 +90,8 @@ - ${CYGWIN_INSTALL_PATH}/bin - /bin - /usr/bin -- /usr/local/bin -+# Uncomment the following to enable /usr/local search -+# /usr/local/bin - /sbin - ) - MARK_AS_ADVANCED( -diff -ru cmake-2.8.6.org//Modules/Findosg_functions.cmake cmake-2.8.6/Modules/Findosg_functions.cmake ---- cmake-2.8.6.org//Modules/Findosg_functions.cmake Tue Oct 4 09:09:24 2011 -+++ cmake-2.8.6/Modules/Findosg_functions.cmake Mon Oct 10 17:06:52 2011 -@@ -34,7 +34,8 @@ - PATHS - /sw # Fink - /opt/local # DarwinPorts -- /opt/csw # Blastwave -+# Uncomment the following to enable /opt/csw search -+# /opt/csw # Blastwave - /opt - /usr/freeware - ) -@@ -58,7 +59,8 @@ - PATHS - /sw # Fink - /opt/local # DarwinPorts -- /opt/csw # Blastwave -+# Uncomment the following to enable /opt/csw search -+# /opt/csw # Blastwave - /opt - /usr/freeware - ) -@@ -74,7 +76,8 @@ - PATHS - /sw # Fink - /opt/local # DarwinPorts -- /opt/csw # Blastwave -+# Uncomment the following to enable /opt/csw search -+# /opt/csw # Blastwave - /opt - /usr/freeware - ) -diff -ru cmake-2.8.6.org//Modules/GetPrerequisites.cmake cmake-2.8.6/Modules/GetPrerequisites.cmake ---- cmake-2.8.6.org//Modules/GetPrerequisites.cmake Tue Oct 4 09:09:24 2011 -+++ cmake-2.8.6/Modules/GetPrerequisites.cmake Tue Oct 11 10:18:31 2011 -@@ -588,7 +588,8 @@ - "C:/Program Files (x86)/Microsoft Visual Studio 8/VC/BIN" - "C:/Program Files/Microsoft Visual Studio .NET 2003/VC7/BIN" - "C:/Program Files (x86)/Microsoft Visual Studio .NET 2003/VC7/BIN" -- "/usr/local/bin" -+# Uncomment the following to enable /usr/local search -+# "/usr/local/bin" - "/usr/bin" - ) - -diff -ru cmake-2.8.6.org//Modules/UseJava.cmake cmake-2.8.6/Modules/UseJava.cmake ---- cmake-2.8.6.org//Modules/UseJava.cmake Tue Oct 4 09:09:24 2011 -+++ cmake-2.8.6/Modules/UseJava.cmake Tue Oct 11 10:22:41 2011 -@@ -445,7 +445,8 @@ - set(_jar_versions) - set(_jar_paths - /usr/share/java/ -- /usr/local/share/java/ -+# Uncomment the following to enable /usr/local search -+# /usr/local/share/java/ - ${Java_JAR_PATHS}) - set(_jar_doc "NOTSET") - -diff -ru cmake-2.8.6.org//Source/cmDocumentation.cxx cmake-2.8.6/Source/cmDocumentation.cxx ---- cmake-2.8.6.org//Source/cmDocumentation.cxx Tue Oct 4 09:09:24 2011 -+++ cmake-2.8.6/Source/cmDocumentation.cxx Tue Oct 18 12:33:05 2011 -@@ -1288,6 +1288,7 @@ - bool cmDocumentation::PrintDocumentationUsage(std::ostream& os) - { - this->ClearSections(); -+ this->AddSectionToPrint("Name"); - this->AddSectionToPrint("Usage"); - this->AddSectionToPrint("Options"); - if(this->ShowGenerators) -@@ -1314,6 +1315,7 @@ - this->ClearSections(); - this->CreateModulesSection(); - this->AddDocumentIntroToPrint(GET_DOCUMENT_INTRO(Modules)); -+ this->AddSectionToPrint("Name"); - this->AddSectionToPrint("Description"); - this->AddSectionToPrint("Modules"); - this->AddSectionToPrint("Copyright"); -@@ -1330,6 +1332,7 @@ - this->ClearSections(); - this->CreateCustomModulesSection(); - this->AddDocumentIntroToPrint(GET_DOCUMENT_INTRO(CustomModules)); -+ this->AddSectionToPrint("Name"); - this->AddSectionToPrint("Description"); - this->AddSectionToPrint("Custom CMake Modules"); - // the custom modules are most probably not under Kitware's copyright, Alex -@@ -1347,6 +1350,7 @@ - { - this->ClearSections(); - this->AddDocumentIntroToPrint(GET_DOCUMENT_INTRO(Policies)); -+ this->AddSectionToPrint("Name"); - this->AddSectionToPrint("Description"); - this->AddSectionToPrint("Policies"); - this->AddSectionToPrint("Copyright"); -@@ -1363,6 +1367,7 @@ - { - this->ClearSections(); - this->AddDocumentIntroToPrint(GET_DOCUMENT_INTRO(Properties)); -+ this->AddSectionToPrint("Name"); - this->AddSectionToPrint("Properties Description"); - for (std::vector::iterator i = - this->PropertySections.begin(); -@@ -1383,6 +1388,7 @@ - { - this->ClearSections(); - this->AddDocumentIntroToPrint(GET_DOCUMENT_INTRO(Variables)); -+ this->AddSectionToPrint("Name"); - for (std::vector::iterator i = - this->VariableSections.begin(); - i != this->VariableSections.end(); ++i) -@@ -1402,6 +1408,7 @@ - { - this->ClearSections(); - this->AddDocumentIntroToPrint(GET_DOCUMENT_INTRO(Commands)); -+ this->AddSectionToPrint("Name"); - this->AddSectionToPrint("Commands"); - this->AddSectionToPrint("Copyright"); - this->AddSectionToPrint("Standard See Also"); -@@ -1416,6 +1423,7 @@ - { - this->ClearSections(); - this->AddDocumentIntroToPrint(GET_DOCUMENT_INTRO(CompatCommands)); -+ this->AddSectionToPrint("Name"); - this->AddSectionToPrint("Compatibility Commands Description"); - this->AddSectionToPrint("Compatibility Commands"); - this->AddSectionToPrint("Copyright"); +diff -ur cmake-2.8.11.orig/Modules/CMakeDetermineJavaCompiler.cmake cmake-2.8.11/Modules/CMakeDetermineJavaCompiler.cmake +--- cmake-2.8.11.orig/Modules/CMakeDetermineJavaCompiler.cmake 2013-05-15 13:38:12.000000000 -0400 ++++ cmake-2.8.11/Modules/CMakeDetermineJavaCompiler.cmake 2015-06-03 09:23:22.247543323 -0400 +@@ -55,9 +55,10 @@ + /usr/bin + /usr/lib/java/bin + /usr/share/java/bin +- /usr/local/bin +- /usr/local/java/bin +- /usr/local/java/share/bin ++# Uncomment the following to enable /usr/local search ++# /usr/local/bin ++# /usr/local/java/bin ++# /usr/local/java/share/bin + /usr/java/j2sdk1.4.2_04 + /usr/lib/j2sdk1.4-sun/bin + /usr/java/j2sdk1.4.2_09/bin +diff -ur cmake-2.8.11.orig/Modules/CMakeDetermineSystem.cmake cmake-2.8.11/Modules/CMakeDetermineSystem.cmake +--- cmake-2.8.11.orig/Modules/CMakeDetermineSystem.cmake 2013-05-15 13:38:12.000000000 -0400 ++++ cmake-2.8.11/Modules/CMakeDetermineSystem.cmake 2015-06-03 09:23:22.248459313 -0400 +@@ -43,7 +43,7 @@ + + # find out on which system cmake runs + if(CMAKE_HOST_UNIX) +- find_program(CMAKE_UNAME uname /bin /usr/bin /usr/local/bin ) ++ find_program(CMAKE_UNAME uname /bin /usr/bin ) + if(CMAKE_UNAME) + exec_program(uname ARGS -s OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_NAME) + exec_program(uname ARGS -r OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_VERSION) +diff -ur cmake-2.8.11.orig/Modules/FindFLTK.cmake cmake-2.8.11/Modules/FindFLTK.cmake +--- cmake-2.8.11.orig/Modules/FindFLTK.cmake 2013-05-15 13:38:12.000000000 -0400 ++++ cmake-2.8.11/Modules/FindFLTK.cmake 2015-06-03 09:23:22.249289326 -0400 +@@ -101,9 +101,12 @@ + + PATHS + # Look in standard UNIX install locations. +- /usr/local/lib/fltk ++ ++# Uncomment the following to enable /usr/local search ++# /usr/local/lib/fltk + /usr/lib/fltk +- /usr/local/fltk ++# Uncomment the following to enable /usr/local search ++# /usr/local/fltk + /usr/X11R6/include + + # Read from the CMakeSetup registry entries. It is likely that +@@ -217,7 +220,6 @@ + endif() + + set(FLTK_INCLUDE_SEARCH_PATH ${FLTK_INCLUDE_SEARCH_PATH} +- /usr/local/fltk + /usr/X11R6/include + ${_FLTK_POSSIBLE_INCLUDE_DIRS} + ) +@@ -238,7 +240,6 @@ + endif() + + set(FLTK_LIBRARY_SEARCH_PATH ${FLTK_LIBRARY_SEARCH_PATH} +- /usr/local/fltk/lib + /usr/X11R6/lib + ${FLTK_INCLUDE_DIR}/lib + ${_FLTK_POSSIBLE_LIBRARY_DIR} +diff -ur cmake-2.8.11.orig/Modules/FindFLTK2.cmake cmake-2.8.11/Modules/FindFLTK2.cmake +--- cmake-2.8.11.orig/Modules/FindFLTK2.cmake 2013-05-15 13:38:12.000000000 -0400 ++++ cmake-2.8.11/Modules/FindFLTK2.cmake 2015-06-03 09:23:22.250061607 -0400 +@@ -79,9 +79,12 @@ + ${FLTK2_DIR_SEARCH} + + # Look in standard UNIX install locations. +- /usr/local/lib/fltk2 ++ ++# Uncomment the following to enable /usr/local search ++# /usr/local/lib/fltk2 + /usr/lib/fltk2 +- /usr/local/fltk2 ++# Uncomment the following to enable /usr/local search ++# /usr/local/fltk2 + /usr/X11R6/include + + # Read from the CMakeSetup registry entries. It is likely that +@@ -187,14 +190,12 @@ + endif() + + set(FLTK2_INCLUDE_SEARCH_PATH ${FLTK2_INCLUDE_SEARCH_PATH} +- /usr/local/fltk2 + /usr/X11R6/include + ) + + find_path(FLTK2_INCLUDE_DIR fltk/run.h ${FLTK2_INCLUDE_SEARCH_PATH}) + + set(FLTK2_LIBRARY_SEARCH_PATH ${FLTK2_LIBRARY_SEARCH_PATH} +- /usr/local/fltk2/lib + /usr/X11R6/lib + ${FLTK2_INCLUDE_DIR}/lib + ) +diff -ur cmake-2.8.11.orig/Modules/FindFreetype.cmake cmake-2.8.11/Modules/FindFreetype.cmake +--- cmake-2.8.11.orig/Modules/FindFreetype.cmake 2013-05-15 13:38:12.000000000 -0400 ++++ cmake-2.8.11/Modules/FindFreetype.cmake 2015-06-03 09:23:53.274456135 -0400 +@@ -47,8 +47,6 @@ + ENV FREETYPE_DIR + PATHS + /usr/X11R6 +- /usr/local/X11R6 +- /usr/local/X11 + /usr/freeware + PATH_SUFFIXES include/freetype2 include + ) +@@ -58,8 +56,6 @@ + ENV FREETYPE_DIR + PATHS + /usr/X11R6 +- /usr/local/X11R6 +- /usr/local/X11 + /usr/freeware + PATH_SUFFIXES include/freetype2 include + ) +@@ -71,8 +67,6 @@ + PATH_SUFFIXES lib + PATHS + /usr/X11R6 +- /usr/local/X11R6 +- /usr/local/X11 + /usr/freeware + ) + +diff -ur cmake-2.8.11.orig/Modules/FindGDAL.cmake cmake-2.8.11/Modules/FindGDAL.cmake +--- cmake-2.8.11.orig/Modules/FindGDAL.cmake 2013-05-15 13:38:12.000000000 -0400 ++++ cmake-2.8.11/Modules/FindGDAL.cmake 2015-06-03 09:23:22.252096773 -0400 +@@ -53,7 +53,8 @@ + /Library/Frameworks/gdal.framework/Headers + /sw # Fink + /opt/local # DarwinPorts +- /opt/csw # Blastwave ++# Uncomment the following to enable /opt/csw search ++# /opt/csw # Blastwave + /opt + ) + +@@ -70,7 +71,8 @@ + PATHS + /sw # Fink + /opt/local # DarwinPorts +- /opt/csw # Blastwave ++# Uncomment the following to enable /opt/csw search ++# /opt/csw # Blastwave + /opt + ) + +@@ -95,7 +97,8 @@ + PATHS + /sw + /opt/local +- /opt/csw ++# Uncomment the following to enable /opt/csw search ++# /opt/csw + /opt + /usr/freeware + ) +diff -ur cmake-2.8.11.orig/Modules/FindGTK.cmake cmake-2.8.11/Modules/FindGTK.cmake +--- cmake-2.8.11.orig/Modules/FindGTK.cmake 2013-05-15 13:38:12.000000000 -0400 ++++ cmake-2.8.11/Modules/FindGTK.cmake 2015-06-03 09:23:22.252824604 -0400 +@@ -36,9 +36,11 @@ + find_path( GTK_glibconfig_INCLUDE_PATH NAMES glibconfig.h + PATHS + /usr/openwin/share/include +- /usr/local/include/glib12 ++# Uncomment the following to enable /usr/local search ++# /usr/local/include/glib12 + /usr/lib/glib/include +- /usr/local/lib/glib/include ++# Uncomment the following to enable /usr/local search ++# /usr/local/lib/glib/include + /opt/gnome/include + /opt/gnome/lib/glib/include + ) +diff -ur cmake-2.8.11.orig/Modules/FindGTK2.cmake cmake-2.8.11/Modules/FindGTK2.cmake +--- cmake-2.8.11.orig/Modules/FindGTK2.cmake 2013-05-15 13:38:12.000000000 -0400 ++++ cmake-2.8.11/Modules/FindGTK2.cmake 2015-06-03 09:23:22.254177342 -0400 +@@ -202,8 +202,6 @@ + find_path(${_var} ${_hdr} + PATHS + ${_gtk2_arch_dir} +- /usr/local/lib64 +- /usr/local/lib + /usr/lib64 + /usr/lib + /opt/gnome/include +diff -ur cmake-2.8.11.orig/Modules/FindJNI.cmake cmake-2.8.11/Modules/FindJNI.cmake +--- cmake-2.8.11.orig/Modules/FindJNI.cmake 2013-05-15 13:38:12.000000000 -0400 ++++ cmake-2.8.11/Modules/FindJNI.cmake 2015-06-03 09:23:22.255054411 -0400 +@@ -102,12 +102,14 @@ + ${_JAVA_HOME}/lib + ${_JAVA_HOME} + /usr/lib +- /usr/local/lib ++# Uncomment the following to enable /usr/local search ++# /usr/local/lib + /usr/lib/jvm/java/lib + /usr/lib/java/jre/lib/{libarch} + /usr/lib/jvm/jre/lib/{libarch} +- /usr/local/lib/java/jre/lib/{libarch} +- /usr/local/share/java/jre/lib/{libarch} ++# Uncomment the following to enable /usr/local search ++# /usr/local/lib/java/jre/lib/{libarch} ++# /usr/local/share/java/jre/lib/{libarch} + /usr/lib/j2sdk1.4-sun/jre/lib/{libarch} + /usr/lib/j2sdk1.5-sun/jre/lib/{libarch} + /opt/sun-jdk-1.5.0.04/jre/lib/{libarch} +@@ -144,15 +146,12 @@ + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include" + ${_JAVA_HOME}/include + /usr/include +- /usr/local/include + /usr/lib/java/include +- /usr/local/lib/java/include + /usr/lib/jvm/java/include + /usr/lib/jvm/java-6-sun/include + /usr/lib/jvm/java-1.5.0-sun/include + /usr/lib/jvm/java-6-sun-1.6.0.00/include # can this one be removed according to #8821 ? Alex + /usr/lib/jvm/java-6-openjdk/include +- /usr/local/share/java/include + /usr/lib/j2sdk1.4-sun/include + /usr/lib/j2sdk1.5-sun/include + /opt/sun-jdk-1.5.0.04/include +diff -ur cmake-2.8.11.orig/Modules/FindJava.cmake cmake-2.8.11/Modules/FindJava.cmake +--- cmake-2.8.11.orig/Modules/FindJava.cmake 2013-05-15 13:38:12.000000000 -0400 ++++ cmake-2.8.11/Modules/FindJava.cmake 2015-06-03 09:23:22.255816655 -0400 +@@ -73,8 +73,9 @@ + set(_JAVA_PATHS + /usr/lib/java/bin + /usr/share/java/bin +- /usr/local/java/bin +- /usr/local/java/share/bin ++# Uncomment the following to enable /usr/local search ++# /usr/local/java/bin ++# /usr/local/java/share/bin + /usr/java/j2sdk1.4.2_04 + /usr/lib/j2sdk1.4-sun/bin + /usr/java/j2sdk1.4.2_09/bin +diff -ur cmake-2.8.11.orig/Modules/FindKDE3.cmake cmake-2.8.11/Modules/FindKDE3.cmake +--- cmake-2.8.11.orig/Modules/FindKDE3.cmake 2013-05-15 13:38:12.000000000 -0400 ++++ cmake-2.8.11/Modules/FindKDE3.cmake 2015-06-03 09:23:22.256559088 -0400 +@@ -141,7 +141,8 @@ + /opt/kde3/include + /opt/kde/include + /usr/include/kde +- /usr/local/include/kde ++# Uncomment the following to enable /usr/local search ++# /usr/local/include/kde + ) + + #now the KDE library directory +diff -ur cmake-2.8.11.orig/Modules/FindMatlab.cmake cmake-2.8.11/Modules/FindMatlab.cmake +--- cmake-2.8.11.orig/Modules/FindMatlab.cmake 2013-05-15 13:38:12.000000000 -0400 ++++ cmake-2.8.11/Modules/FindMatlab.cmake 2015-06-03 09:23:22.257323197 -0400 +@@ -60,7 +60,6 @@ + if(CMAKE_SIZEOF_VOID_P EQUAL 4) + # Regular x86 + set(MATLAB_ROOT +- /usr/local/matlab-7sp1/bin/glnx86/ + /opt/matlab-7sp1/bin/glnx86/ + $ENV{HOME}/matlab-7sp1/bin/glnx86/ + $ENV{HOME}/redhat-matlab/bin/glnx86/ +@@ -68,7 +67,6 @@ + else() + # AMD64: + set(MATLAB_ROOT +- /usr/local/matlab-7sp1/bin/glnxa64/ + /opt/matlab-7sp1/bin/glnxa64/ + $ENV{HOME}/matlab7_64/bin/glnxa64/ + $ENV{HOME}/matlab-7sp1/bin/glnxa64/ +@@ -89,7 +87,8 @@ + ) + find_path(MATLAB_INCLUDE_DIR + "mex.h" +- "/usr/local/matlab-7sp1/extern/include/" ++# Uncomment the following to enable /usr/local search ++# "/usr/local/matlab-7sp1/extern/include/" + "/opt/matlab-7sp1/extern/include/" + "$ENV{HOME}/matlab-7sp1/extern/include/" + "$ENV{HOME}/redhat-matlab/extern/include/" +diff -ur cmake-2.8.11.orig/Modules/FindOpenThreads.cmake cmake-2.8.11/Modules/FindOpenThreads.cmake +--- cmake-2.8.11.orig/Modules/FindOpenThreads.cmake 2013-05-15 13:38:12.000000000 -0400 ++++ cmake-2.8.11/Modules/FindOpenThreads.cmake 2015-06-03 09:23:22.258100593 -0400 +@@ -70,7 +70,8 @@ + PATHS + /sw # Fink + /opt/local # DarwinPorts +- /opt/csw # Blastwave ++# Uncomment the following to enable /opt/csw search ++# /opt/csw # Blastwave + /opt + /usr/freeware + PATH_SUFFIXES include +@@ -92,7 +93,8 @@ + PATHS + /sw + /opt/local +- /opt/csw ++# Uncomment the following to enable /opt/csw search ++# /opt/csw + /opt + /usr/freeware + PATH_SUFFIXES lib +@@ -114,7 +116,8 @@ + PATHS + /sw + /opt/local +- /opt/csw ++# Uncomment the following to enable /opt/csw search ++# /opt/csw + /opt + /usr/freeware + PATH_SUFFIXES lib +diff -ur cmake-2.8.11.orig/Modules/FindPHP4.cmake cmake-2.8.11/Modules/FindPHP4.cmake +--- cmake-2.8.11.orig/Modules/FindPHP4.cmake 2013-05-15 13:38:12.000000000 -0400 ++++ cmake-2.8.11/Modules/FindPHP4.cmake 2015-06-03 09:23:22.258830040 -0400 +@@ -22,10 +22,12 @@ + + set(PHP4_POSSIBLE_INCLUDE_PATHS + /usr/include/php4 +- /usr/local/include/php4 ++# Uncomment the following to enable /usr/local search ++# /usr/local/include/php4 + /usr/include/php +- /usr/local/include/php +- /usr/local/apache/php ++# Uncomment the following to enable /usr/local search ++# /usr/local/include/php ++# /usr/local/apache/php + ) + + set(PHP4_POSSIBLE_LIB_PATHS +diff -ur cmake-2.8.11.orig/Modules/FindPike.cmake cmake-2.8.11/Modules/FindPike.cmake +--- cmake-2.8.11.orig/Modules/FindPike.cmake 2013-05-15 13:38:12.000000000 -0400 ++++ cmake-2.8.11/Modules/FindPike.cmake 2015-06-03 09:23:22.259621567 -0400 +@@ -22,7 +22,9 @@ + + file(GLOB PIKE_POSSIBLE_INCLUDE_PATHS + /usr/include/pike/* +- /usr/local/include/pike/*) ++# Uncomment the following to enable /usr/local search ++# /usr/local/include/pike/*) ++ ) + + find_path(PIKE_INCLUDE_PATH program.h + ${PIKE_POSSIBLE_INCLUDE_PATHS}) +diff -ur cmake-2.8.11.orig/Modules/FindQt.cmake cmake-2.8.11/Modules/FindQt.cmake +--- cmake-2.8.11.orig/Modules/FindQt.cmake 2013-05-15 13:38:12.000000000 -0400 ++++ cmake-2.8.11/Modules/FindQt.cmake 2015-06-03 09:23:22.260431615 -0400 +@@ -98,8 +98,9 @@ + "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/include/Qt" + ${qt_headers}/Qt + $ENV{QTDIR}/include/Qt +- /usr/local/qt/include/Qt +- /usr/local/include/Qt ++# Uncomment the following to enable /usr/local search ++# /usr/local/qt/include/Qt ++# /usr/local/include/Qt + /usr/lib/qt/include/Qt + /usr/include/Qt + /usr/share/qt4/include/Qt +@@ -118,8 +119,9 @@ + C:/Qt/3.3.3Educational/include + $ENV{QTDIR}/include + /usr/include/qt3/Qt +- /usr/local/qt/include +- /usr/local/include ++# Uncomment the following to enable /usr/local search ++# /usr/local/qt/include ++# /usr/local/include + /usr/lib/qt/include + /usr/include + /usr/share/qt3/include +diff -ur cmake-2.8.11.orig/Modules/FindQt3.cmake cmake-2.8.11/Modules/FindQt3.cmake +--- cmake-2.8.11.orig/Modules/FindQt3.cmake 2013-05-15 13:38:12.000000000 -0400 ++++ cmake-2.8.11/Modules/FindQt3.cmake 2015-06-03 09:24:32.531157053 -0400 +@@ -57,14 +57,12 @@ + "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt" + $ENV{QTDIR}/include + ${GLOB_PATHS} +- /usr/local/qt/include + /usr/lib/qt/include + /usr/lib/qt3/include + /usr/include/qt + /usr/share/qt3/include + C:/Progra~1/qt/include + /usr/include/qt3 +- /usr/local/include/X11/qt3 + ) + + # if qglobal.h is not in the qt_include_dir then set +@@ -97,7 +95,6 @@ + "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]" + ENV QTDIR + ${GLOB_PATHS_LIB} +- /usr/local/qt + /usr/lib/qt + /usr/lib/qt3 + /usr/share/qt3 +@@ -118,7 +115,6 @@ + "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]" + ENV QTDIR + ${GLOB_PATHS_LIB} +- /usr/local/qt + /usr/lib/qt + /usr/lib/qt3 + /usr/share/qt3 +@@ -137,7 +133,6 @@ + "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]" + ENV QTDIR + ${GLOB_PATHS_LIB} +- /usr/local/qt + /usr/lib/qt3 + /usr/share/qt3 + C:/Progra~1/qt +@@ -155,8 +150,6 @@ + "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/include/Qt" + "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt" + ${GLOB_PATHS_BIN} +- /usr/local/lib/qt3 +- /usr/local/qt + /usr/lib/qt + /usr/lib/qt3 + /usr/share/qt3 +@@ -180,7 +173,6 @@ + "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/include/Qt" + "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt" + ${GLOB_PATHS_BIN} +- /usr/local/qt + /usr/lib/qt + /usr/lib/qt3 + /usr/share/qt3 +diff -ur cmake-2.8.11.orig/Modules/FindSDL.cmake cmake-2.8.11/Modules/FindSDL.cmake +--- cmake-2.8.11.orig/Modules/FindSDL.cmake 2013-05-15 13:38:12.000000000 -0400 ++++ cmake-2.8.11/Modules/FindSDL.cmake 2015-06-03 09:23:22.262455917 -0400 +@@ -96,7 +96,8 @@ + PATHS + /sw + /opt/local +- /opt/csw ++# Uncomment the following to enable /opt/csw search ++# /opt/csw + /opt + ) + endif() +diff -ur cmake-2.8.11.orig/Modules/FindSDL_sound.cmake cmake-2.8.11/Modules/FindSDL_sound.cmake +--- cmake-2.8.11.orig/Modules/FindSDL_sound.cmake 2013-05-15 13:38:12.000000000 -0400 ++++ cmake-2.8.11/Modules/FindSDL_sound.cmake 2015-06-03 09:23:22.263470720 -0400 +@@ -196,7 +196,6 @@ + ENV SDLDIR + /sw + /opt/local +- /opt/csw + /opt + PATH_SUFFIXES + lib +@@ -216,7 +215,6 @@ + ENV SDLDIR + /sw + /opt/local +- /opt/csw + /opt + PATH_SUFFIXES + lib +@@ -238,7 +236,6 @@ + ENV SDLDIR + /sw + /opt/local +- /opt/csw + /opt + PATH_SUFFIXES + lib +@@ -256,7 +253,6 @@ + ENV SDLDIR + /sw + /opt/local +- /opt/csw + /opt + PATH_SUFFIXES + lib +@@ -277,7 +273,6 @@ + ENV SDLDIR + /sw + /opt/local +- /opt/csw + /opt + PATH_SUFFIXES + lib +@@ -298,7 +293,6 @@ + ENV SDLDIR + /sw + /opt/local +- /opt/csw + /opt + PATH_SUFFIXES + lib +@@ -322,7 +316,6 @@ + ENV SDLDIR + /sw + /opt/local +- /opt/csw + /opt + PATH_SUFFIXES + lib +@@ -344,7 +337,6 @@ + ENV SDLDIR + /sw + /opt/local +- /opt/csw + /opt + PATH_SUFFIXES lib + ) +diff -ur cmake-2.8.11.orig/Modules/FindSelfPackers.cmake cmake-2.8.11/Modules/FindSelfPackers.cmake +--- cmake-2.8.11.orig/Modules/FindSelfPackers.cmake 2013-05-15 13:38:12.000000000 -0400 ++++ cmake-2.8.11/Modules/FindSelfPackers.cmake 2015-06-03 09:23:22.264180415 -0400 +@@ -25,7 +25,6 @@ + ${CYGWIN_INSTALL_PATH}/bin + /bin + /usr/bin +- /usr/local/bin + /sbin + ) + +@@ -34,7 +33,6 @@ + ${CYGWIN_INSTALL_PATH}/bin + /bin + /usr/bin +- /usr/local/bin + /sbin + ) + +diff -ur cmake-2.8.11.orig/Modules/FindUnixCommands.cmake cmake-2.8.11/Modules/FindUnixCommands.cmake +--- cmake-2.8.11.orig/Modules/FindUnixCommands.cmake 2013-05-15 13:38:12.000000000 -0400 ++++ cmake-2.8.11/Modules/FindUnixCommands.cmake 2015-06-03 09:23:22.264959035 -0400 +@@ -22,7 +22,6 @@ + ${CYGWIN_INSTALL_PATH}/bin + /bin + /usr/bin +- /usr/local/bin + /sbin + ) + mark_as_advanced( +@@ -34,7 +33,6 @@ + ${CYGWIN_INSTALL_PATH}/bin + /bin + /usr/bin +- /usr/local/bin + /sbin + ) + mark_as_advanced( +@@ -46,7 +44,6 @@ + ${CYGWIN_INSTALL_PATH}/bin + /bin + /usr/bin +- /usr/local/bin + /sbin + ) + mark_as_advanced( +@@ -58,7 +55,6 @@ + ${CYGWIN_INSTALL_PATH}/bin + /bin + /usr/bin +- /usr/local/bin + /sbin + ) + mark_as_advanced( +@@ -70,7 +66,6 @@ + ${CYGWIN_INSTALL_PATH}/bin + /bin + /usr/bin +- /usr/local/bin + /sbin + ) + mark_as_advanced( +@@ -85,7 +80,6 @@ + ${CYGWIN_INSTALL_PATH}/bin + /bin + /usr/bin +- /usr/local/bin + /sbin + ) + mark_as_advanced( +diff -ur cmake-2.8.11.orig/Modules/Findosg_functions.cmake cmake-2.8.11/Modules/Findosg_functions.cmake +--- cmake-2.8.11.orig/Modules/Findosg_functions.cmake 2013-05-15 13:38:12.000000000 -0400 ++++ cmake-2.8.11/Modules/Findosg_functions.cmake 2015-06-03 09:23:22.265694142 -0400 +@@ -37,7 +37,8 @@ + PATHS + /sw # Fink + /opt/local # DarwinPorts +- /opt/csw # Blastwave ++# Uncomment the following to enable /opt/csw search ++# /opt/csw # Blastwave + /opt + /usr/freeware + ) +@@ -63,7 +64,8 @@ + PATHS + /sw # Fink + /opt/local # DarwinPorts +- /opt/csw # Blastwave ++# Uncomment the following to enable /opt/csw search ++# /opt/csw # Blastwave + /opt + /usr/freeware + ) +@@ -81,7 +83,8 @@ + PATHS + /sw # Fink + /opt/local # DarwinPorts +- /opt/csw # Blastwave ++# Uncomment the following to enable /opt/csw search ++# /opt/csw # Blastwave + /opt + /usr/freeware + ) +diff -ur cmake-2.8.11.orig/Modules/GetPrerequisites.cmake cmake-2.8.11/Modules/GetPrerequisites.cmake +--- cmake-2.8.11.orig/Modules/GetPrerequisites.cmake 2013-05-15 13:38:12.000000000 -0400 ++++ cmake-2.8.11/Modules/GetPrerequisites.cmake 2015-06-03 09:23:22.266633860 -0400 +@@ -575,7 +575,8 @@ + "C:/Program Files (x86)/Microsoft Visual Studio 8/VC/BIN" + "C:/Program Files/Microsoft Visual Studio .NET 2003/VC7/BIN" + "C:/Program Files (x86)/Microsoft Visual Studio .NET 2003/VC7/BIN" +- "/usr/local/bin" ++# Uncomment the following to enable /usr/local search ++# "/usr/local/bin" + "/usr/bin" + ) + +diff -ur cmake-2.8.11.orig/Modules/UseJava.cmake cmake-2.8.11/Modules/UseJava.cmake +--- cmake-2.8.11.orig/Modules/UseJava.cmake 2013-05-15 13:38:13.000000000 -0400 ++++ cmake-2.8.11/Modules/UseJava.cmake 2015-06-03 09:23:22.267527501 -0400 +@@ -498,7 +498,8 @@ + set(_jar_versions) + set(_jar_paths + /usr/share/java/ +- /usr/local/share/java/ ++# Uncomment the following to enable /usr/local search ++# /usr/local/share/java/ + ${Java_JAR_PATHS}) + set(_jar_doc "NOTSET") + +diff -ur cmake-2.8.11.orig/Source/cmDocumentation.cxx cmake-2.8.11/Source/cmDocumentation.cxx +--- cmake-2.8.11.orig/Source/cmDocumentation.cxx 2013-05-15 13:38:13.000000000 -0400 ++++ cmake-2.8.11/Source/cmDocumentation.cxx 2015-06-03 09:23:22.268757962 -0400 +@@ -1674,6 +1674,7 @@ + bool cmDocumentation::PrintDocumentationUsage(std::ostream& os) + { + this->ClearSections(); ++ this->AddSectionToPrint("Name"); + this->AddSectionToPrint("Usage"); + this->AddSectionToPrint("Options"); + if(this->ShowGenerators) +@@ -1700,6 +1701,7 @@ + this->ClearSections(); + this->CreateModulesSection(); + this->AddDocumentIntroToPrint(GET_DOCUMENT_INTRO(Modules)); ++ this->AddSectionToPrint("Name"); + this->AddSectionToPrint("Description"); + this->AddSectionToPrint("Modules"); + this->AddSectionToPrint("Copyright"); +@@ -1716,6 +1718,7 @@ + this->ClearSections(); + this->CreateCustomModulesSection(); + this->AddDocumentIntroToPrint(GET_DOCUMENT_INTRO(CustomModules)); ++ this->AddSectionToPrint("Name"); + this->AddSectionToPrint("Description"); + this->AddSectionToPrint("Custom CMake Modules"); + // the custom modules are most probably not under Kitware's copyright, Alex +@@ -1733,6 +1736,7 @@ + { + this->ClearSections(); + this->AddDocumentIntroToPrint(GET_DOCUMENT_INTRO(Policies)); ++ this->AddSectionToPrint("Name"); + this->AddSectionToPrint("Description"); + this->AddSectionToPrint("Policies"); + this->AddSectionToPrint("Copyright"); +@@ -1749,6 +1753,7 @@ + { + this->ClearSections(); + this->AddDocumentIntroToPrint(GET_DOCUMENT_INTRO(Properties)); ++ this->AddSectionToPrint("Name"); + this->AddSectionToPrint("Properties Description"); + for (std::vector::iterator i = + this->PropertySections.begin(); +@@ -1769,6 +1774,7 @@ + { + this->ClearSections(); + this->AddDocumentIntroToPrint(GET_DOCUMENT_INTRO(Variables)); ++ this->AddSectionToPrint("Name"); + for (std::vector::iterator i = + this->VariableSections.begin(); + i != this->VariableSections.end(); ++i) +@@ -1788,6 +1794,7 @@ + { + this->ClearSections(); + this->AddDocumentIntroToPrint(GET_DOCUMENT_INTRO(Commands)); ++ this->AddSectionToPrint("Name"); + this->AddSectionToPrint("Commands"); + this->AddSectionToPrint("Copyright"); + this->AddSectionToPrint("Standard See Also"); +@@ -1802,6 +1809,7 @@ + { + this->ClearSections(); + this->AddDocumentIntroToPrint(GET_DOCUMENT_INTRO(CompatCommands)); ++ this->AddSectionToPrint("Name"); + this->AddSectionToPrint("Compatibility Commands Description"); + this->AddSectionToPrint("Compatibility Commands"); + this->AddSectionToPrint("Copyright"); -- 2.11.4.GIT