Hello community, here is the log from the commit of package cmake checked in at Wed Aug 6 01:42:14 CEST 2008. -------- --- cmake/cmake.changes 2008-07-31 13:31:42.000000000 +0200 +++ /mounts/work_src_done/STABLE/cmake/cmake.changes 2008-08-03 23:47:20.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Aug 3 23:46:24 CEST 2008 - dmueller@suse.de + +- update to 2.6.1: + * Fix for bug 7427, preinstall target name hard coded + +------------------------------------------------------------------- Old: ---- cmake-2.6.1-RC-15.tar.bz2 New: ---- cmake-2.6.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cmake.spec ++++++ --- /var/tmp/diff_new_pack.D26696/_old 2008-08-06 01:41:56.000000000 +0200 +++ /var/tmp/diff_new_pack.D26696/_new 2008-08-06 01:41:56.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package cmake (Version 2.6.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -13,10 +20,10 @@ Name: cmake Version: 2.6.1 -Release: 14 +Release: 19 License: BSD 3-Clause Group: Development/Tools/Building -%define tar_version 2.6.1-RC-15 +%define tar_version %version Url: http://www.cmake.org/ Source0: %{name}-%{tar_version}.tar.bz2 Patch0: cmake-2.6.0-use_intree_xmlrpc.patch @@ -122,6 +129,9 @@ %endif %changelog +* Mon Aug 04 2008 dmueller@suse.de +- update to 2.6.1: + * Fix for bug 7427, preinstall target name hard coded * Wed Jul 23 2008 dmueller@suse.de - update to 2.6.1-RC15: * FindMPI: Use the HINTS feature of find_library to find the right ++++++ cmake-2.6.1-RC-15.tar.bz2 -> cmake-2.6.1.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmake-2.6.1-RC-15/ChangeLog.manual new/cmake-2.6.1/ChangeLog.manual --- old/cmake-2.6.1-RC-15/ChangeLog.manual 2008-07-30 21:36:03.000000000 +0200 +++ new/cmake-2.6.1/ChangeLog.manual 2008-08-01 17:34:50.000000000 +0200 @@ -1,3 +1,10 @@ +Changes in CMake 2.6.1 RC 16 +- Fix for bug 7427, preinstall target name hard coded +- Fix issue #7088 - do not emit error messages when attempts to run + Visual Studio macros fail. You can still get the error output + as messages if you want using --debug-output from the cmake command line. +- Fix InstallRequiredSystemLibraries.cmake to work with win64 + Changes in CMake 2.6.1 RC 15 - Fix bug 7426 FindJPEG module causes error when setting JPEG_LIBRARY to blank - Fix bug 7414 PackageMaker generator crashes when given components diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmake-2.6.1-RC-15/CMakeLists.txt new/cmake-2.6.1/CMakeLists.txt --- old/cmake-2.6.1-RC-15/CMakeLists.txt 2008-07-30 21:36:03.000000000 +0200 +++ new/cmake-2.6.1/CMakeLists.txt 2008-08-01 17:34:50.000000000 +0200 @@ -354,7 +354,7 @@ SET(CMake_VERSION_MAJOR 2) SET(CMake_VERSION_MINOR 6) SET(CMake_VERSION_PATCH 1) -SET(CMake_VERSION_RC 15) +#SET(CMake_VERSION_RC 16) # CVS versions are odd, if this is an odd minor version # then set the CMake_VERSION_DATE variable IF("${CMake_VERSION_MINOR}" MATCHES "[13579]$") diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmake-2.6.1-RC-15/Modules/InstallRequiredSystemLibraries.cmake new/cmake-2.6.1/Modules/InstallRequiredSystemLibraries.cmake --- old/cmake-2.6.1-RC-15/Modules/InstallRequiredSystemLibraries.cmake 2008-07-30 21:36:04.000000000 +0200 +++ new/cmake-2.6.1/Modules/InstallRequiredSystemLibraries.cmake 2008-08-01 17:34:50.000000000 +0200 @@ -26,13 +26,20 @@ "${SYSTEMROOT}/system32/msvcr71.dll" ) ENDIF(MSVC71) + + IF(CMAKE_CL_64) + SET(CMAKE_MSVC_ARCH amd64) + ELSE(CMAKE_CL_64) + SET(CMAKE_MSVC_ARCH x86) + ENDIF(CMAKE_CL_64) + IF(MSVC80) # Find the runtime library redistribution directory. - FIND_PATH(MSVC80_REDIST_DIR NAMES x86/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest + FIND_PATH(MSVC80_REDIST_DIR NAMES ${CMAKE_MSVC_ARCH}/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0;InstallDir]/../../VC/redist" ) MARK_AS_ADVANCED(MSVC80_REDIST_DIR) - SET(MSVC80_CRT_DIR "${MSVC80_REDIST_DIR}/x86/Microsoft.VC80.CRT") + SET(MSVC80_CRT_DIR "${MSVC80_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.VC80.CRT") # Install the manifest that allows DLLs to be loaded from the # directory containing the executable. @@ -45,7 +52,7 @@ IF(CMAKE_INSTALL_DEBUG_LIBRARIES) SET(MSVC80_CRT_DIR - "${MSVC80_REDIST_DIR}/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT") + "${MSVC80_REDIST_DIR}/Debug_NonRedist/${CMAKE_MSVC_ARCH}/Microsoft.VC80.DebugCRT") SET(__install__libs ${__install__libs} "${MSVC80_CRT_DIR}/Microsoft.VC80.DebugCRT.manifest" "${MSVC80_CRT_DIR}/msvcm80d.dll" @@ -57,13 +64,13 @@ ENDIF(MSVC80) IF(MSVC90) # Find the runtime library redistribution directory. - FIND_PATH(MSVC90_REDIST_DIR NAMES x86/Microsoft.VC90.CRT/Microsoft.VC90.CRT.manifest + FIND_PATH(MSVC90_REDIST_DIR NAMES ${CMAKE_MSVC_ARCH}/Microsoft.VC90.CRT/Microsoft.VC90.CRT.manifest PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\9.0;InstallDir]/../../VC/redist" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VCExpress\\9.0;InstallDir]/../../VC/redist" ) MARK_AS_ADVANCED(MSVC90_REDIST_DIR) - SET(MSVC90_CRT_DIR "${MSVC90_REDIST_DIR}/x86/Microsoft.VC90.CRT") + SET(MSVC90_CRT_DIR "${MSVC90_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.VC90.CRT") # Install the manifest that allows DLLs to be loaded from the # directory containing the executable. @@ -75,7 +82,7 @@ ) IF(CMAKE_INSTALL_DEBUG_LIBRARIES) SET(MSVC90_CRT_DIR - "${MSVC90_REDIST_DIR}/Debug_NonRedist/x86/Microsoft.VC90.DebugCRT") + "${MSVC90_REDIST_DIR}/Debug_NonRedist/${CMAKE_MSVC_ARCH}/Microsoft.VC90.DebugCRT") SET(__install__libs ${__install__libs} "${MSVC90_CRT_DIR}/Microsoft.VC90.DebugCRT.manifest" "${MSVC90_CRT_DIR}/msvcm90d.dll" @@ -98,7 +105,7 @@ IF(MSVC80) IF(CMAKE_INSTALL_DEBUG_LIBRARIES) SET(MSVC80_MFC_DIR - "${MSVC80_REDIST_DIR}/Debug_NonRedist/x86/Microsoft.VC80.DebugMFC") + "${MSVC80_REDIST_DIR}/Debug_NonRedist/${CMAKE_MSVC_ARCH}/Microsoft.VC80.DebugMFC") SET(__install__libs ${__install__libs} "${MSVC80_MFC_DIR}/Microsoft.VC80.DebugMFC.manifest" "${MSVC80_MFC_DIR}/mfc80d.dll" @@ -108,7 +115,7 @@ ) ENDIF(CMAKE_INSTALL_DEBUG_LIBRARIES) - SET(MSVC80_MFC_DIR "${MSVC80_REDIST_DIR}/x86/Microsoft.VC80.MFC") + SET(MSVC80_MFC_DIR "${MSVC80_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.VC80.MFC") # Install the manifest that allows DLLs to be loaded from the # directory containing the executable. SET(__install__libs ${__install__libs} @@ -119,7 +126,7 @@ "${MSVC80_MFC_DIR}/mfcm80u.dll" ) # include the language dll's for vs8 as well as the actuall dll's - SET(MSVC80_MFCLOC_DIR "${MSVC80_REDIST_DIR}/x86/Microsoft.VC80.MFCLOC") + SET(MSVC80_MFCLOC_DIR "${MSVC80_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.VC80.MFCLOC") # Install the manifest that allows DLLs to be loaded from the # directory containing the executable. SET(__install__libs ${__install__libs} @@ -138,7 +145,7 @@ IF(MSVC90) IF(CMAKE_INSTALL_DEBUG_LIBRARIES) SET(MSVC90_MFC_DIR - "${MSVC90_REDIST_DIR}/Debug_NonRedist/x86/Microsoft.VC90.DebugMFC") + "${MSVC90_REDIST_DIR}/Debug_NonRedist/${CMAKE_MSVC_ARCH}/Microsoft.VC90.DebugMFC") SET(__install__libs ${__install__libs} "${MSVC90_MFC_DIR}/Microsoft.VC90.DebugMFC.manifest" "${MSVC90_MFC_DIR}/mfc90d.dll" @@ -148,7 +155,7 @@ ) ENDIF(CMAKE_INSTALL_DEBUG_LIBRARIES) - SET(MSVC90_MFC_DIR "${MSVC90_REDIST_DIR}/x86/Microsoft.VC90.MFC") + SET(MSVC90_MFC_DIR "${MSVC90_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.VC90.MFC") # Install the manifest that allows DLLs to be loaded from the # directory containing the executable. SET(__install__libs ${__install__libs} @@ -159,7 +166,7 @@ "${MSVC90_MFC_DIR}/mfcm90u.dll" ) # include the language dll's for vs9 as well as the actuall dll's - SET(MSVC90_MFCLOC_DIR "${MSVC90_REDIST_DIR}/x86/Microsoft.VC90.MFCLOC") + SET(MSVC90_MFCLOC_DIR "${MSVC90_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.VC90.MFCLOC") # Install the manifest that allows DLLs to be loaded from the # directory containing the executable. SET(__install__libs ${__install__libs} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmake-2.6.1-RC-15/Source/cmake.cxx new/cmake-2.6.1/Source/cmake.cxx --- old/cmake-2.6.1-RC-15/Source/cmake.cxx 2008-07-30 21:36:05.000000000 +0200 +++ new/cmake-2.6.1/Source/cmake.cxx 2008-08-01 17:34:51.000000000 +0200 @@ -3,8 +3,8 @@ Program: CMake - Cross-Platform Makefile Generator Module: $RCSfile: cmake.cxx,v $ Language: C++ - Date: $Date: 2008-07-13 21:55:24 $ - Version: $Revision: 1.375.2.9 $ + Date: $Date: 2008-07-31 15:52:24 $ + Version: $Revision: 1.375.2.10 $ Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved. See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details. @@ -1422,7 +1422,8 @@ } } - return cmCallVisualStudioMacro::CallMacro(args[2], args[3], macroArgs); + return cmCallVisualStudioMacro::CallMacro(args[2], args[3], + macroArgs, true); } #endif diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmake-2.6.1-RC-15/Source/cmCallVisualStudioMacro.cxx new/cmake-2.6.1/Source/cmCallVisualStudioMacro.cxx --- old/cmake-2.6.1-RC-15/Source/cmCallVisualStudioMacro.cxx 2008-07-30 21:36:05.000000000 +0200 +++ new/cmake-2.6.1/Source/cmCallVisualStudioMacro.cxx 2008-08-01 17:34:51.000000000 +0200 @@ -3,8 +3,8 @@ Program: CMake - Cross-Platform Makefile Generator Module: $RCSfile: cmCallVisualStudioMacro.cxx,v $ Language: C++ - Date: $Date: 2008-02-15 16:49:58 $ - Version: $Revision: 1.3 $ + Date: $Date: 2008-07-31 15:52:24 $ + Version: $Revision: 1.3.2.1 $ Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved. See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details. @@ -24,6 +24,11 @@ #endif +// Just for this file: +// +static bool LogErrorsAsMessages; + + #if defined(HAVE_COMDEF_H) @@ -31,17 +36,20 @@ //---------------------------------------------------------------------------- -///! Use ReportHRESULT to make a cmSystemTools::Error after calling +///! Use ReportHRESULT to make a cmSystemTools::Message after calling ///! a COM method that may have failed. #define ReportHRESULT(hr, context) \ if (FAILED(hr)) \ { \ - std::ostringstream oss; \ - oss.flags(std::ios::hex); \ - oss << context << " failed HRESULT, hr = 0x" << hr << std::endl; \ - oss.flags(std::ios::dec); \ - oss << __FILE__ << "(" << __LINE__ << ")"; \ - cmSystemTools::Error(oss.str().c_str()); \ + if (LogErrorsAsMessages) \ + { \ + std::ostringstream oss; \ + oss.flags(std::ios::hex); \ + oss << context << " failed HRESULT, hr = 0x" << hr << std::endl; \ + oss.flags(std::ios::dec); \ + oss << __FILE__ << "(" << __LINE__ << ")"; \ + cmSystemTools::Message(oss.str().c_str()); \ + } \ } @@ -404,6 +412,8 @@ { int count = 0; + LogErrorsAsMessages = false; + #if defined(HAVE_COMDEF_H) HRESULT hr = CoInitialize(0); ReportHRESULT(hr, "CoInitialize"); @@ -438,10 +448,13 @@ int cmCallVisualStudioMacro::CallMacro( const std::string& slnFile, const std::string& macro, - const std::string& args) + const std::string& args, + const bool logErrorsAsMessages) { int err = 1; // no comdef.h + LogErrorsAsMessages = logErrorsAsMessages; + #if defined(HAVE_COMDEF_H) err = 2; // error initializing @@ -489,16 +502,19 @@ (void)slnFile; (void)macro; (void)args; - cmSystemTools::Error("cmCallVisualStudioMacro::CallMacro is not " - "supported on this platform"); + if (LogErrorsAsMessages) + { + cmSystemTools::Message("cmCallVisualStudioMacro::CallMacro is not " + "supported on this platform"); + } #endif - if (err) + if (err && LogErrorsAsMessages) { std::ostringstream oss; oss << "cmCallVisualStudioMacro::CallMacro failed, err = " << err; - cmSystemTools::Error(oss.str().c_str()); + cmSystemTools::Message(oss.str().c_str()); } - return err; + return 0; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmake-2.6.1-RC-15/Source/cmCallVisualStudioMacro.h new/cmake-2.6.1/Source/cmCallVisualStudioMacro.h --- old/cmake-2.6.1-RC-15/Source/cmCallVisualStudioMacro.h 2008-07-30 21:36:05.000000000 +0200 +++ new/cmake-2.6.1/Source/cmCallVisualStudioMacro.h 2008-08-01 17:34:51.000000000 +0200 @@ -3,8 +3,8 @@ Program: CMake - Cross-Platform Makefile Generator Module: $RCSfile: cmCallVisualStudioMacro.h,v $ Language: C++ - Date: $Date: 2007-11-16 12:01:58 $ - Version: $Revision: 1.1 $ + Date: $Date: 2008-07-31 15:52:24 $ + Version: $Revision: 1.1.2.1 $ Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved. See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details. @@ -33,7 +33,8 @@ ///! macro in each Visual Studio instance. static int CallMacro(const std::string& slnFile, const std::string& macro, - const std::string& args); + const std::string& args, + const bool logErrorsAsMessages); ///! Count the number of running instances of Visual Studio with the ///! given solution file open. Pass "ALL" for slnFile to count all diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmake-2.6.1-RC-15/Source/cmGlobalGenerator.cxx new/cmake-2.6.1/Source/cmGlobalGenerator.cxx --- old/cmake-2.6.1-RC-15/Source/cmGlobalGenerator.cxx 2008-07-30 21:36:05.000000000 +0200 +++ new/cmake-2.6.1/Source/cmGlobalGenerator.cxx 2008-08-01 17:34:52.000000000 +0200 @@ -3,8 +3,8 @@ Program: CMake - Cross-Platform Makefile Generator Module: $RCSfile: cmGlobalGenerator.cxx,v $ Language: C++ - Date: $Date: 2008-07-17 14:14:25 $ - Version: $Revision: 1.227.2.5 $ + Date: $Date: 2008-07-31 15:52:24 $ + Version: $Revision: 1.227.2.6 $ Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved. See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details. @@ -1565,7 +1565,7 @@ cpackCommandLines.push_back(singleLine); if ( this->GetPreinstallTargetName() ) { - depends.push_back("preinstall"); + depends.push_back(this->GetPreinstallTargetName()); } else { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmake-2.6.1-RC-15/Source/cmGlobalVisualStudioGenerator.cxx new/cmake-2.6.1/Source/cmGlobalVisualStudioGenerator.cxx --- old/cmake-2.6.1-RC-15/Source/cmGlobalVisualStudioGenerator.cxx 2008-07-30 21:36:06.000000000 +0200 +++ new/cmake-2.6.1/Source/cmGlobalVisualStudioGenerator.cxx 2008-08-01 17:34:52.000000000 +0200 @@ -3,8 +3,8 @@ Program: CMake - Cross-Platform Makefile Generator Module: $RCSfile: cmGlobalVisualStudioGenerator.cxx,v $ Language: C++ - Date: $Date: 2008-05-01 16:35:39 $ - Version: $Revision: 1.11.2.1 $ + Date: $Date: 2008-07-31 15:52:24 $ + Version: $Revision: 1.11.2.2 $ Copyright (c) 2002 Kitware, Inc., Insight Consortium. All rights reserved. See Copyright.txt or http://www.cmake.org/HTML/Copyright.html for details. @@ -178,14 +178,16 @@ projects += ";"; projects += *it; } - cmCallVisualStudioMacro::CallMacro - (topLevelSlnName, CMAKE_VSMACROS_RELOAD_MACRONAME, projects); + cmCallVisualStudioMacro::CallMacro(topLevelSlnName, + CMAKE_VSMACROS_RELOAD_MACRONAME, projects, + this->GetCMakeInstance()->GetDebugOutput()); } } else if(m == MacroStop) { cmCallVisualStudioMacro::CallMacro(topLevelSlnName, - CMAKE_VSMACROS_STOP_MACRONAME, ""); + CMAKE_VSMACROS_STOP_MACRONAME, "", + this->GetCMakeInstance()->GetDebugOutput()); } } } Files old/cmake-2.6.1-RC-15/Tests/BundleGeneratorTest/BundleIcon.icns and new/cmake-2.6.1/Tests/BundleGeneratorTest/BundleIcon.icns differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmake-2.6.1-RC-15/Tests/BundleGeneratorTest/CMakeLists.txt new/cmake-2.6.1/Tests/BundleGeneratorTest/CMakeLists.txt --- old/cmake-2.6.1-RC-15/Tests/BundleGeneratorTest/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/cmake-2.6.1/Tests/BundleGeneratorTest/CMakeLists.txt 2008-08-01 17:34:55.000000000 +0200 @@ -0,0 +1,24 @@ +PROJECT(BundleGeneratorTest) + +CMAKE_MINIMUM_REQUIRED(VERSION 2.6) + +# Build a shared library and install it in lib/ +ADD_LIBRARY(Library SHARED Library.cxx) +INSTALL(TARGETS Library DESTINATION lib) + +# Build an executable and install it in bin/ +ADD_EXECUTABLE(Executable Executable.cxx) +TARGET_LINK_LIBRARIES(Executable Library) +INSTALL(TARGETS Executable DESTINATION bin) + +# Use the bundle-generator for packaging ... +SET(CPACK_GENERATOR "Bundle") +SET(CPACK_BUNDLE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/BundleIcon.icns") +SET(CPACK_BUNDLE_NAME "BundleGeneratorTest") +SET(CPACK_BUNDLE_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/Info.plist") +SET(CPACK_BUNDLE_STARTUP_COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/StartupCommand") +SET(CPACK_PACKAGE_DESCRIPTION "Project for testing OSX bundle generation") +SET(CPACK_PACKAGE_NAME "BundleGeneratorTest") +SET(CPACK_PACKAGE_VERSION "0.1") +INCLUDE(CPack) + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmake-2.6.1-RC-15/Tests/BundleGeneratorTest/Executable.cxx new/cmake-2.6.1/Tests/BundleGeneratorTest/Executable.cxx --- old/cmake-2.6.1-RC-15/Tests/BundleGeneratorTest/Executable.cxx 1970-01-01 01:00:00.000000000 +0100 +++ new/cmake-2.6.1/Tests/BundleGeneratorTest/Executable.cxx 2008-08-01 17:34:55.000000000 +0200 @@ -0,0 +1,8 @@ +extern void print_message(const char* const Message); + +int main(int argc, char* argv[]) +{ + print_message("Howdy, World!\n"); + return 0; +} + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmake-2.6.1-RC-15/Tests/BundleGeneratorTest/Info.plist new/cmake-2.6.1/Tests/BundleGeneratorTest/Info.plist --- old/cmake-2.6.1-RC-15/Tests/BundleGeneratorTest/Info.plist 1970-01-01 01:00:00.000000000 +0100 +++ new/cmake-2.6.1/Tests/BundleGeneratorTest/Info.plist 2008-08-01 17:34:55.000000000 +0200 @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> + <dict> + <key>CFBundleExecutable</key> + <string>BundleGeneratorTest</string> + <key>CFBundleIconFile</key> + <string>BundleGeneratorTest.icns</string> + <key>CFBundleInfoDictionaryVersion</key> + <string>6.0</string> + <key>CFBundlePackageType</key> + <string>APPL</string> + </dict> +</plist> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmake-2.6.1-RC-15/Tests/BundleGeneratorTest/Library.cxx new/cmake-2.6.1/Tests/BundleGeneratorTest/Library.cxx --- old/cmake-2.6.1-RC-15/Tests/BundleGeneratorTest/Library.cxx 1970-01-01 01:00:00.000000000 +0100 +++ new/cmake-2.6.1/Tests/BundleGeneratorTest/Library.cxx 2008-08-01 17:34:55.000000000 +0200 @@ -0,0 +1,7 @@ +#include <iostream> + +void print_message(const char* const Message) +{ + std::cout << Message; +} + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmake-2.6.1-RC-15/Tests/BundleGeneratorTest/StartupCommand new/cmake-2.6.1/Tests/BundleGeneratorTest/StartupCommand --- old/cmake-2.6.1-RC-15/Tests/BundleGeneratorTest/StartupCommand 1970-01-01 01:00:00.000000000 +0100 +++ new/cmake-2.6.1/Tests/BundleGeneratorTest/StartupCommand 2008-08-01 17:34:55.000000000 +0200 @@ -0,0 +1,12 @@ +#!/bin/sh + +BUNDLE="`echo "$0" | sed -e 's/\/Contents\/MacOS\/.*//'`" +RESOURCES="$BUNDLE/Contents/Resources" + +echo "BUNDLE: $BUNDLE" +echo "RESOURCES: $RESOURCES" + +export DYLD_LIBRARY_PATH=$RESOURCES/lib + +exec "$RESOURCES/bin/Executable" + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/cmake-2.6.1-RC-15/Tests/CMakeLists.txt new/cmake-2.6.1/Tests/CMakeLists.txt --- old/cmake-2.6.1-RC-15/Tests/CMakeLists.txt 2008-07-30 21:36:08.000000000 +0200 +++ new/cmake-2.6.1/Tests/CMakeLists.txt 2008-08-01 17:34:55.000000000 +0200 @@ -705,6 +705,20 @@ ADD_TEST_MACRO(ObjC++ ObjC++) ENDIF (APPLE AND CMAKE_COMPILER_IS_GNUCXX) + IF(APPLE AND CTEST_TEST_CPACK) + ADD_TEST(BundleGeneratorTest ${CMAKE_CTEST_COMMAND} + --build-and-test + "${CMake_SOURCE_DIR}/Tests/BundleGeneratorTest" + "${CMake_BINARY_DIR}/Tests/BundleGeneratorTest" + --build-two-config + --build-generator ${CMAKE_TEST_GENERATOR} + --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM} + --build-project BundleGeneratorTest + --build-target package + --build-options "-DCMAKE_INSTALL_PREFIX:PATH=${CMake_BINARY_DIR}/Tests/BundleGeneratorTest/InstallDirectory" + ) + ENDIF(APPLE AND CTEST_TEST_CPACK) + IF (CTEST_TEST_CTEST AND CMAKE_RUN_LONG_TESTS) CONFIGURE_FILE("${CMake_SOURCE_DIR}/Tests/CTestTest/test.cmake.in" "${CMake_BINARY_DIR}/Tests/CTestTest/test.cmake" @ONLY ESCAPE_QUOTES) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org