[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5253-ge3ffd7c
Brad King
brad.king at kitware.com
Mon Nov 18 09:02:21 EST 2013
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 e3ffd7c0da471dd1e394702051db384da3f9de85 (commit)
via e238afd1c9c6c6f5572366387ebbe7e0f631be5b (commit)
from aefbc39385a96f3c2b80db7d9d311529d92f5957 (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=e3ffd7c0da471dd1e394702051db384da3f9de85
commit e3ffd7c0da471dd1e394702051db384da3f9de85
Merge: aefbc39 e238afd
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 18 09:02:05 2013 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 18 09:02:05 2013 -0500
Merge topic 'cleanup-tests-in-next' into next
e238afd Remove tests.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e238afd1c9c6c6f5572366387ebbe7e0f631be5b
commit e238afd1c9c6c6f5572366387ebbe7e0f631be5b
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Nov 18 10:16:48 2013 +0100
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 18 09:00:43 2013 -0500
Remove tests.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 48554c2..6426b3a 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -250,9 +250,6 @@ if(BUILD_TESTING)
ADD_TEST_MACRO(CompatibleInterface CompatibleInterface)
ADD_TEST_MACRO(AliasTarget AliasTarget)
ADD_TEST_MACRO(InterfaceLibrary InterfaceLibrary)
- if(UNIX AND CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
- ADD_TEST_MACRO(ToolchainSettings ToolchainSettings)
- endif()
set_tests_properties(EmptyLibrary PROPERTIES
PASS_REGULAR_EXPRESSION "CMake Error: CMake can not determine linker language for target: test")
ADD_TEST_MACRO(CrossCompile CrossCompile)
diff --git a/Tests/ToolchainSettings/CMakeLists.txt b/Tests/ToolchainSettings/CMakeLists.txt
deleted file mode 100644
index cfab583..0000000
--- a/Tests/ToolchainSettings/CMakeLists.txt
+++ /dev/null
@@ -1,117 +0,0 @@
-cmake_minimum_required(VERSION 2.8.12)
-cmake_policy(SET CMP0025 NEW)
-project(ToolchainSettings)
-
-# Wipe out the install tree
-add_custom_command(
- OUTPUT ${CMAKE_BINARY_DIR}/CleanupProject
- COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_BINARY_DIR}/Consumer
- COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_BINARY_DIR}/Producer
- COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_BINARY_DIR}/sysroot
- COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_BINARY_DIR}/stage
- )
-add_custom_target(CleanupTarget ALL DEPENDS ${CMAKE_BINARY_DIR}/CleanupProject)
-set_property(
- SOURCE ${CMAKE_BINARY_DIR}/CleanupProject
- PROPERTY SYMBOLIC 1
- )
-
-if(CMAKE_CONFIGURATION_TYPES)
- set(NESTED_CONFIG_TYPE -C "${CMAKE_CFG_INTDIR}")
-else()
- if(CMAKE_BUILD_TYPE)
- set(NESTED_CONFIG_TYPE -C "${CMAKE_BUILD_TYPE}")
- else()
- set(NESTED_CONFIG_TYPE)
- endif()
-endif()
-
-execute_process(COMMAND
- "${CMAKE_CXX_COMPILER}" -dumpmachine
- OUTPUT_VARIABLE triple
- OUTPUT_STRIP_TRAILING_WHITESPACE
-)
-
-if (triple AND NOT "${CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES}" MATCHES ${triple})
- set(triple)
-else()
- add_definitions(-DEXPECT_SHORT_LIBS=1)
-endif()
-
-macro(write_make_script name)
- file(WRITE "${CMAKE_BINARY_DIR}/CMakeFiles/Make${name}.sh"
- "#!/bin/sh\n${CMAKE_MAKE_PROGRAM} install > \"${CMAKE_BINARY_DIR}/make_${name}_output\"\n"
- )
- file(COPY "${CMAKE_BINARY_DIR}/CMakeFiles/Make${name}.sh"
- DESTINATION "${CMAKE_BINARY_DIR}"
- FILE_PERMISSIONS
- OWNER_READ OWNER_EXECUTE
- )
-endmacro()
-
-write_make_script(Producer)
-
-# Build and install the producer.
-add_custom_command(
- OUTPUT ${CMAKE_BINARY_DIR}/ProducerProject
- COMMAND ${CMAKE_CTEST_COMMAND} ${NESTED_CONFIG_TYPE}
- --build-and-test
- ${CMAKE_SOURCE_DIR}/Producer
- ${CMAKE_BINARY_DIR}/Producer
- --build-noclean
- --build-project Producer
- --build-generator ${CMAKE_GENERATOR}
- --build-generator-toolset "${CMAKE_GENERATOR_TOOLSET}"
- --build-makeprogram "${CMAKE_BINARY_DIR}/MakeProducer.sh"
- --build-options
- -Dtriple=${triple}
- -Dsysroot=${CMAKE_BINARY_DIR}/sysroot
- -DCMAKE_VERBOSE_MAKEFILE=1
- VERBATIM
- )
-
-add_custom_target(ProducerTarget ALL DEPENDS ${CMAKE_BINARY_DIR}/ProducerProject)
-add_dependencies(ProducerTarget CleanupTarget)
-set_property(
- SOURCE ${CMAKE_BINARY_DIR}/ProducerProject
- PROPERTY SYMBOLIC 1
- )
-
-configure_file(${CMAKE_SOURCE_DIR}/${CMAKE_CXX_COMPILER_ID}-Toolchain.cmake.in
- ${CMAKE_BINARY_DIR}/${CMAKE_CXX_COMPILER_ID}-Toolchain.cmake @ONLY)
-
-write_make_script(Consumer)
-
-# Build and install the consumer.
-add_custom_command(
- OUTPUT ${CMAKE_BINARY_DIR}/ConsumerProject
- COMMAND ${CMAKE_CTEST_COMMAND} ${NESTED_CONFIG_TYPE}
- --build-and-test
- ${CMAKE_SOURCE_DIR}/Consumer
- ${CMAKE_BINARY_DIR}/Consumer
- --build-noclean
- --build-project Consumer
- --build-generator ${CMAKE_GENERATOR}
- --build-generator-toolset "${CMAKE_GENERATOR_TOOLSET}"
- --build-makeprogram "${CMAKE_BINARY_DIR}/MakeConsumer.sh"
- --build-options
- -DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/InstallationPrefix
- -DCMAKE_TOOLCHAIN_FILE=${CMAKE_BINARY_DIR}/${CMAKE_CXX_COMPILER_ID}-Toolchain.cmake
- -Dtriple=${triple}
- -DCMAKE_VERBOSE_MAKEFILE=1
- VERBATIM
- )
-add_custom_target(ToolchainSettingsTest ALL DEPENDS ${CMAKE_BINARY_DIR}/ConsumerProject)
-add_dependencies(ToolchainSettingsTest ProducerTarget)
-set_property(
- SOURCE ${CMAKE_BINARY_DIR}/ConsumerProject
- PROPERTY SYMBOLIC 1
- )
-
-add_executable(ToolchainSettings main.cpp)
-target_compile_definitions(ToolchainSettings
- PRIVATE
- "-DMAKE_OUTPUT=\"${CMAKE_BINARY_DIR}/make_Consumer_output\""
- "-DCOMPILER=\"${CMAKE_CXX_COMPILER}\""
-)
-add_dependencies(ToolchainSettings ToolchainSettingsTest)
diff --git a/Tests/ToolchainSettings/Clang-Toolchain.cmake.in b/Tests/ToolchainSettings/Clang-Toolchain.cmake.in
deleted file mode 100644
index 534b120..0000000
--- a/Tests/ToolchainSettings/Clang-Toolchain.cmake.in
+++ /dev/null
@@ -1,16 +0,0 @@
-
-set(CMAKE_SYSTEM_NAME Linux)
-
-set(CMAKE_SYSROOT "@CMAKE_BINARY_DIR@/sysroot")
-set(CMAKE_STAGING_PREFIX "@CMAKE_BINARY_DIR@/stage")
-
-set(CMAKE_C_COMPILER_TARGET @triple@)
-set(CMAKE_CXX_COMPILER_TARGET @triple@)
-
-set(CMAKE_C_COMPILER "@CMAKE_C_COMPILER@")
-set(CMAKE_CXX_COMPILER "@CMAKE_CXX_COMPILER@")
-
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
diff --git a/Tests/ToolchainSettings/Consumer/CMakeLists.txt b/Tests/ToolchainSettings/Consumer/CMakeLists.txt
deleted file mode 100644
index 8040e18..0000000
--- a/Tests/ToolchainSettings/Consumer/CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-
-cmake_minimum_required (VERSION 2.8.12)
-project(Consumer)
-
-foreach(_lang C CXX)
- set(_existing ${CMAKE_${_lang}_IMPLICIT_LINK_DIRECTORIES})
- set(CMAKE_${_lang}_IMPLICIT_LINK_DIRECTORIES)
- foreach(_dir ${_existing})
- if(_dir MATCHES ${CMAKE_SYSROOT})
- list(APPEND CMAKE_${_lang}_IMPLICIT_LINK_DIRECTORIES ${_dir})
- endif()
- endforeach()
-endforeach()
-
-message("CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES: ${CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES}")
-
-find_package(ZLIB REQUIRED)
-set(CMAKE_CXX_LINK_FLAGS "-L\"${CMAKE_SYSROOT}/usr/lib/${triple}\"")
-
-add_executable(executable main.cpp)
-target_link_libraries(executable ${ZLIB_LIBRARIES})
-
-install(TARGETS executable DESTINATION bin)
diff --git a/Tests/ToolchainSettings/Consumer/main.cpp b/Tests/ToolchainSettings/Consumer/main.cpp
deleted file mode 100644
index a395ca9..0000000
--- a/Tests/ToolchainSettings/Consumer/main.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-
-#include "zlib.h"
-
-#ifndef FAKE_ZLIB
-#error Expected FAKE_ZLIB
-#endif
-
-int main(int ,char **)
-{
- return fakezlib();
-}
diff --git a/Tests/ToolchainSettings/GNU-Toolchain.cmake.in b/Tests/ToolchainSettings/GNU-Toolchain.cmake.in
deleted file mode 100644
index 27b04cf..0000000
--- a/Tests/ToolchainSettings/GNU-Toolchain.cmake.in
+++ /dev/null
@@ -1,13 +0,0 @@
-
-set(CMAKE_SYSTEM_NAME Linux)
-
-set(CMAKE_SYSROOT "@CMAKE_BINARY_DIR@/sysroot")
-set(CMAKE_STAGING_PREFIX "@CMAKE_BINARY_DIR@/stage")
-
-set(CMAKE_C_COMPILER "@CMAKE_C_COMPILER@")
-set(CMAKE_CXX_COMPILER "@CMAKE_CXX_COMPILER@")
-
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
diff --git a/Tests/ToolchainSettings/Producer/CMakeLists.txt b/Tests/ToolchainSettings/Producer/CMakeLists.txt
deleted file mode 100644
index b4f1d3f..0000000
--- a/Tests/ToolchainSettings/Producer/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-
-cmake_minimum_required (VERSION 2.8.12)
-project(Producer)
-
-add_library(fakezlib SHARED fakezlib.cpp)
-set_property(TARGET fakezlib PROPERTY SOVERSION 1)
-set_property(TARGET fakezlib PROPERTY VERSION 1.2.7)
-set_property(TARGET fakezlib PROPERTY LIBRARY_OUTPUT_DIRECTORY ${sysroot}/lib/${triple})
-set_property(TARGET fakezlib PROPERTY OUTPUT_NAME z)
-
-file(MAKE_DIRECTORY "${sysroot}/usr/lib/${triple}/")
-add_custom_command(TARGET fakezlib POST_BUILD
- COMMAND ${CMAKE_COMMAND} -E remove "${sysroot}/lib/${triple}/libz.so"
- COMMAND ${CMAKE_COMMAND} -E create_symlink "${sysroot}/lib/${triple}/libz.so.1.2.7" "${sysroot}/usr/lib/${triple}/libz.so"
-)
-file(COPY "fakezlib.h" DESTINATION "${CMAKE_BINARY_DIR}")
-file(RENAME "${CMAKE_BINARY_DIR}/fakezlib.h" "${CMAKE_BINARY_DIR}/zlib.h")
-
-install(FILES "${CMAKE_BINARY_DIR}/zlib.h" DESTINATION "${sysroot}/usr/include/")
diff --git a/Tests/ToolchainSettings/Producer/fakezlib.cpp b/Tests/ToolchainSettings/Producer/fakezlib.cpp
deleted file mode 100644
index 0712ffe..0000000
--- a/Tests/ToolchainSettings/Producer/fakezlib.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-
-#include "fakezlib.h"
-
-int fakezlib(void)
-{
- return 0;
-}
diff --git a/Tests/ToolchainSettings/Producer/fakezlib.h b/Tests/ToolchainSettings/Producer/fakezlib.h
deleted file mode 100644
index 5d25657..0000000
--- a/Tests/ToolchainSettings/Producer/fakezlib.h
+++ /dev/null
@@ -1,9 +0,0 @@
-
-#ifndef FAKE_ZLIB
-#define FAKE_ZLIB
-
-#define ZLIB_VERSION "1.2.7"
-
-int fakezlib(void);
-
-#endif
diff --git a/Tests/ToolchainSettings/main.cpp b/Tests/ToolchainSettings/main.cpp
deleted file mode 100644
index 64ea867..0000000
--- a/Tests/ToolchainSettings/main.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-
-#include <string>
-#include <fstream>
-#include <iostream>
-
-int main(void)
-{
- std::ifstream f;
- f.open(MAKE_OUTPUT);
- if (!f.is_open())
- {
- return -1;
- }
- std::string content;
-
- bool gotCompilation = false;
- bool gotLink = false;
- bool gotInstallation = false;
- while (!f.eof())
- {
- std::string output;
- getline(f,output);
- if (output.find(COMPILER) != std::string::npos)
- {
- if (output.find("-sysroot") == std::string::npos)
- {
- std::cout << "Sysroot not used by compiler: " << output << std::endl;
- return -1;
- }
- if (output.find(" -c ") != std::string::npos)
- {
- gotCompilation = true;
- if (output.find(" -I") != std::string::npos)
- {
- std::cout << "Unexpected include: " << output << std::endl;
- return -1;
- }
- if (output.find(" -isystem") != std::string::npos)
- {
- std::cout << "Unexpected include: " << output << std::endl;
- return -1;
- }
- }
- else
- {
- gotLink = true;
-#ifdef EXPECT_SHORT_LIBS
- if (output.find("libz.so") != std::string::npos)
- {
- std::cout << "Unexpected library name: " << output << std::endl;
- return -1;
- }
- if (output.find("-lz") == std::string::npos)
- {
- std::cout << "Expected -lz: " << output << std::endl;
- return -1;
- }
-#else
- if (output.find("libz.so") == std::string::npos)
- {
- std::cout << "Expected library name: " << output << std::endl;
- return -1;
- }
-#endif
- }
- }
- else if (output.find("-- Installing: ") != std::string::npos)
- {
- gotInstallation = true;
- if (output.find("/stage/") == std::string::npos)
- {
- std::cout << "Install outside stage: " << output << std::endl;
- return -1;
- }
- if (output.find("InstallationPrefix") != std::string::npos)
- {
- std::cout << "Install to prefix, not stage: " << output << std::endl;
- return -1;
- }
- }
- }
- if (!gotCompilation)
- {
- std::cout << "Compilation step missing." << std::endl;
- return -1;
- }
- if (!gotLink)
- {
- std::cout << "Link step missing." << std::endl;
- return -1;
- }
- if (!gotInstallation)
- {
- std::cout << "Installation step missing." << std::endl;
- return -1;
- }
- f.close();
-
- return 0;
-}
-----------------------------------------------------------------------
Summary of changes:
Tests/CMakeLists.txt | 3 -
Tests/ToolchainSettings/CMakeLists.txt | 117 ----------------------
Tests/ToolchainSettings/Clang-Toolchain.cmake.in | 16 ---
Tests/ToolchainSettings/Consumer/CMakeLists.txt | 23 ----
Tests/ToolchainSettings/Consumer/main.cpp | 11 --
Tests/ToolchainSettings/GNU-Toolchain.cmake.in | 13 ---
Tests/ToolchainSettings/Producer/CMakeLists.txt | 19 ----
Tests/ToolchainSettings/Producer/fakezlib.cpp | 7 --
Tests/ToolchainSettings/Producer/fakezlib.h | 9 --
Tests/ToolchainSettings/main.cpp | 100 ------------------
10 files changed, 0 insertions(+), 318 deletions(-)
delete mode 100644 Tests/ToolchainSettings/CMakeLists.txt
delete mode 100644 Tests/ToolchainSettings/Clang-Toolchain.cmake.in
delete mode 100644 Tests/ToolchainSettings/Consumer/CMakeLists.txt
delete mode 100644 Tests/ToolchainSettings/Consumer/main.cpp
delete mode 100644 Tests/ToolchainSettings/GNU-Toolchain.cmake.in
delete mode 100644 Tests/ToolchainSettings/Producer/CMakeLists.txt
delete mode 100644 Tests/ToolchainSettings/Producer/fakezlib.cpp
delete mode 100644 Tests/ToolchainSettings/Producer/fakezlib.h
delete mode 100644 Tests/ToolchainSettings/main.cpp
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list