This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via c321a6ca7f31534a7b56442247c84c2881a85677 (commit)
via fcd55310047811fcae8e4ac45651cc47ae39add5 (commit)
from df31fcc4de0dbfd4a314f7e086d03e421ddbccc4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c321a6ca7f31534a7b56442247c84c2881a85677
commit c321a6ca7f31534a7b56442247c84c2881a85677
Merge: df31fcc fcd5531
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Jan 10 04:30:01 2014 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 10 04:30:01 2014 -0500
Merge topic 'remove-duplicate-file' into next
fcd5531 Tests: Remove .orig file.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fcd55310047811fcae8e4ac45651cc47ae39add5
commit fcd55310047811fcae8e4ac45651cc47ae39add5
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Jan 10 10:28:23 2014 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Jan 10 10:29:36 2014 +0100
Tests: Remove .orig file.
Introduced in commit be0458c5 (InstallRules: added new variable to
disable generation of install rules, 2013-12-25).
diff --git a/Tests/RunCMake/CMakeLists.txt.orig b/Tests/RunCMake/CMakeLists.txt.orig
deleted file mode 100644
index 96b0543..0000000
--- a/Tests/RunCMake/CMakeLists.txt.orig
+++ /dev/null
@@ -1,142 +0,0 @@
-# This directory contains tests that run CMake to configure a project
-# but do not actually build anything. To add a test:
-#
-# 1.) Add a subdirectory named for the test.
-#
-# 2.) Call add_RunCMake_test and pass the test directory name.
-#
-# 3.) Create a RunCMakeTest.cmake script in the directory containing
-# include(RunCMake)
-# run_cmake(SubTest1)
-# ...
-# run_cmake(SubTestN)
-# where SubTest1..SubTestN are sub-test names each corresponding to
-# an independent CMake run and project configuration.
-#
-# 3.) Create a CMakeLists.txt file in the directory containing
-# cmake_minimum_required(...)
-# project(${RunCMake_TEST} NONE) # or languages needed
-# include(${RunCMake_TEST}.cmake)
-# where "${RunCMake_TEST}" is literal. A value for RunCMake_TEST
-# will be passed to CMake by the run_cmake macro when running each
-# sub-test.
-#
-# 4.) Create a <SubTest>.cmake file for each sub-test named above
-# containing the actual test code. Optionally create files
-# containing expected test results:
-# <SubTest>-result.txt = Process result expected if not "0"
-# <SubTest>-stdout.txt = Regex matching expected stdout content
-# <SubTest>-stderr.txt = Regex matching expected stderr content
-# <SubTest>-check.cmake = Custom result check
-# Note that trailing newlines will be stripped from actual and expected test
-# output before matching against the stdout and stderr expressions.
-# The code in <SubTest>-check.cmake may use variables
-# RunCMake_TEST_SOURCE_DIR = Top of test source tree
-# RunCMake_TEST_BINARY_DIR = Top of test binary tree
-# and an failure must store a message in RunCMake_TEST_FAILED.
-
-macro(add_RunCMake_test test)
- add_test(RunCMake.${test} ${CMAKE_CMAKE_COMMAND}
- -DCMAKE_MODULE_PATH=${CMAKE_CURRENT_SOURCE_DIR}
- -DRunCMake_GENERATOR=${CMAKE_TEST_GENERATOR}
- -DRunCMake_GENERATOR_TOOLSET=${CMAKE_TEST_GENERATOR_TOOLSET}
- -DRunCMake_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}/${test}
- -DRunCMake_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR}/${test}
- ${${test}_ARGS}
- -P "${CMAKE_CURRENT_SOURCE_DIR}/${test}/RunCMakeTest.cmake"
- )
-endmacro()
-
-if(XCODE_VERSION AND "${XCODE_VERSION}" VERSION_LESS 3)
- set(GeneratorToolset_ARGS -DXCODE_BELOW_3=1)
-endif()
-
-add_RunCMake_test(CMP0019)
-add_RunCMake_test(CMP0022)
-add_RunCMake_test(CMP0026)
-add_RunCMake_test(CMP0027)
-add_RunCMake_test(CMP0028)
-add_RunCMake_test(CMP0037)
-add_RunCMake_test(CMP0038)
-add_RunCMake_test(CMP0039)
-add_RunCMake_test(CMP0040)
-add_RunCMake_test(CMP0041)
-add_RunCMake_test(CTest)
-if(UNIX AND "${CMAKE_TEST_GENERATOR}" MATCHES "Unix Makefiles")
- add_RunCMake_test(CompilerChange)
-endif()
-add_RunCMake_test(CompilerNotFound)
-add_RunCMake_test(Configure)
-add_RunCMake_test(DisallowedCommands)
-add_RunCMake_test(ExternalData)
-add_RunCMake_test(FPHSA)
-add_RunCMake_test(GeneratorExpression)
-add_RunCMake_test(GeneratorToolset)
-add_RunCMake_test(TargetPropertyGeneratorExpressions)
-add_RunCMake_test(Languages)
-add_RunCMake_test(ObjectLibrary)
-if(NOT WIN32)
- add_RunCMake_test(PositionIndependentCode)
- set(SKIP_VISIBILITY 0)
- if("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU" AND "${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS 4.2)
- set(SKIP_VISIBILITY 1)
- endif()
-
- if (CMAKE_CXX_COMPILER_ID MATCHES Watcom
- OR CMAKE_SYSTEM_NAME MATCHES IRIX64
- OR CMAKE_CXX_COMPILER_ID MATCHES HP
- OR CMAKE_CXX_COMPILER_ID MATCHES XL
- OR CMAKE_CXX_COMPILER_ID MATCHES SunPro)
- set(SKIP_VISIBILITY 1)
- endif()
-
- if (NOT SKIP_VISIBILITY)
- add_RunCMake_test(VisibilityPreset)
- endif()
-endif()
-if (QT4_FOUND)
- set(CompatibleInterface_ARGS -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE})
-endif()
-add_RunCMake_test(CompatibleInterface)
-add_RunCMake_test(Syntax)
-
-add_RunCMake_test(add_dependencies)
-add_RunCMake_test(build_command)
-add_RunCMake_test(export)
-add_RunCMake_test(cmake_minimum_required)
-add_RunCMake_test(find_package)
-add_RunCMake_test(get_filename_component)
-add_RunCMake_test(if)
-add_RunCMake_test(include)
-add_RunCMake_test(include_directories)
-add_RunCMake_test(list)
-add_RunCMake_test(message)
-add_RunCMake_test(string)
-add_RunCMake_test(try_compile)
-add_RunCMake_test(set)
-add_RunCMake_test(variable_watch)
-add_RunCMake_test(CMP0004)
-add_RunCMake_test(TargetPolicies)
-add_RunCMake_test(alias_targets)
-add_RunCMake_test(interface_library)
-add_RunCMake_test(no_install_prefix)
-
-find_package(Qt4 QUIET)
-find_package(Qt5Core QUIET)
-if (QT4_FOUND AND Qt5Core_FOUND AND NOT Qt5Core_VERSION VERSION_LESS 5.1.0)
- add_RunCMake_test(IncompatibleQt)
-endif()
-if (QT4_FOUND)
- set(ObsoleteQtMacros_ARGS -DQT_QMAKE_EXECUTABLE:FILEPATH=${QT_QMAKE_EXECUTABLE})
- add_RunCMake_test(ObsoleteQtMacros)
-endif()
-
-if("${CMAKE_TEST_GENERATOR}" MATCHES "Visual Studio [^6]")
- add_RunCMake_test(include_external_msproject)
- add_RunCMake_test(SolutionGlobalSections)
-endif()
-
-add_RunCMake_test(File_Generate)
-add_RunCMake_test(ExportWithoutLanguage)
-add_RunCMake_test(target_link_libraries)
-add_RunCMake_test(CheckModules)
-----------------------------------------------------------------------
Summary of changes:
Tests/RunCMake/CMakeLists.txt.orig | 142 ------------------------------------
1 files changed, 0 insertions(+), 142 deletions(-)
delete mode 100644 Tests/RunCMake/CMakeLists.txt.orig
hooks/post-receive
--
CMake