[Cmake-commits] CMake branch, next, updated. v3.0.0-3997-g288e5bf
Brad King
brad.king at kitware.com
Sun Jun 29 09:44:30 EDT 2014
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 288e5bf5a195302e52290272ad9784fdb35a84c7 (commit)
via b417078225f9588300774dcbcf8328d51b60f117 (commit)
from 53ece55f0bf137573118543409595c8b5bd4cf48 (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=288e5bf5a195302e52290272ad9784fdb35a84c7
commit 288e5bf5a195302e52290272ad9784fdb35a84c7
Merge: 53ece55 b417078
Author: Brad King <brad.king at kitware.com>
AuthorDate: Sun Jun 29 09:44:29 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Jun 29 09:44:29 2014 -0400
Merge topic 'test-speedup-RunCMake.include_directories' into next
b4170782 Revert "Tests: Speed up RunCMake.include_directories test"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b417078225f9588300774dcbcf8328d51b60f117
commit b417078225f9588300774dcbcf8328d51b60f117
Author: Brad King <brad.king at kitware.com>
AuthorDate: Sun Jun 29 09:45:15 2014 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Sun Jun 29 09:45:15 2014 -0400
Revert "Tests: Speed up RunCMake.include_directories test"
This reverts commit 00fefc496ce7ac797a1c09caa845b9f1baef7514.
It will be revised.
diff --git a/Tests/RunCMake/include_directories/BinaryDirectoryInInterface.cmake b/Tests/RunCMake/include_directories/BinaryDirectoryInInterface.cmake
index 67ee7de..8754540 100644
--- a/Tests/RunCMake/include_directories/BinaryDirectoryInInterface.cmake
+++ b/Tests/RunCMake/include_directories/BinaryDirectoryInInterface.cmake
@@ -1,5 +1,5 @@
-enable_language(CXX)
+project(BinaryDirectoryInInterface)
add_library(testTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
target_include_directories(testTarget INTERFACE "${CMAKE_CURRENT_BINARY_DIR}/foo")
diff --git a/Tests/RunCMake/include_directories/CMakeLists.txt b/Tests/RunCMake/include_directories/CMakeLists.txt
index 2897109..3482e6b 100644
--- a/Tests/RunCMake/include_directories/CMakeLists.txt
+++ b/Tests/RunCMake/include_directories/CMakeLists.txt
@@ -1,3 +1,3 @@
cmake_minimum_required(VERSION 3.0)
-project(${RunCMake_TEST} NONE)
+project(${RunCMake_TEST} CXX)
include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/include_directories/DebugIncludes.cmake b/Tests/RunCMake/include_directories/DebugIncludes.cmake
index 10a4c50..bbc9e46 100644
--- a/Tests/RunCMake/include_directories/DebugIncludes.cmake
+++ b/Tests/RunCMake/include_directories/DebugIncludes.cmake
@@ -1,5 +1,5 @@
-enable_language(CXX)
+project(DebugIncludes)
set(CMAKE_DEBUG_TARGET_PROPERTIES INCLUDE_DIRECTORIES)
diff --git a/Tests/RunCMake/include_directories/DirInInstallPrefix.cmake b/Tests/RunCMake/include_directories/DirInInstallPrefix.cmake
index fab7717..d6f08bd 100644
--- a/Tests/RunCMake/include_directories/DirInInstallPrefix.cmake
+++ b/Tests/RunCMake/include_directories/DirInInstallPrefix.cmake
@@ -1,4 +1,4 @@
-enable_language(CXX)
+
add_library(testTarget empty.cpp)
target_include_directories(testTarget INTERFACE "${CMAKE_INSTALL_PREFIX}/dir")
diff --git a/Tests/RunCMake/include_directories/ImportedTarget.cmake b/Tests/RunCMake/include_directories/ImportedTarget.cmake
index f752f98..e1a20b1 100644
--- a/Tests/RunCMake/include_directories/ImportedTarget.cmake
+++ b/Tests/RunCMake/include_directories/ImportedTarget.cmake
@@ -1,5 +1,5 @@
-enable_language(CXX)
+project(ImportedTarget)
add_library(testTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
diff --git a/Tests/RunCMake/include_directories/InstallPrefixInInterface.cmake b/Tests/RunCMake/include_directories/InstallPrefixInInterface.cmake
index 8d777f5..0f08e58 100644
--- a/Tests/RunCMake/include_directories/InstallPrefixInInterface.cmake
+++ b/Tests/RunCMake/include_directories/InstallPrefixInInterface.cmake
@@ -1,5 +1,5 @@
-enable_language(CXX)
+project(InstallPrefixInInterface)
add_library(testTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
target_include_directories(testTarget INTERFACE "${CMAKE_INSTALL_PREFIX}/foo")
diff --git a/Tests/RunCMake/include_directories/RelativePathInGenex.cmake b/Tests/RunCMake/include_directories/RelativePathInGenex.cmake
index 070a381..f72cf3a 100644
--- a/Tests/RunCMake/include_directories/RelativePathInGenex.cmake
+++ b/Tests/RunCMake/include_directories/RelativePathInGenex.cmake
@@ -1,5 +1,5 @@
-enable_language(CXX)
+project(RelativePathInInterface)
add_library(testTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
set_property(TARGET testTarget PROPERTY INTERFACE_INCLUDE_DIRECTORIES "$<1:foo>")
diff --git a/Tests/RunCMake/include_directories/RelativePathInInterface.cmake b/Tests/RunCMake/include_directories/RelativePathInInterface.cmake
index 4c4727d..f2ce54a 100644
--- a/Tests/RunCMake/include_directories/RelativePathInInterface.cmake
+++ b/Tests/RunCMake/include_directories/RelativePathInInterface.cmake
@@ -1,5 +1,5 @@
-enable_language(CXX)
+project(RelativePathInInterface)
add_library(testTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
set_property(TARGET testTarget PROPERTY INTERFACE_INCLUDE_DIRECTORIES "foo")
diff --git a/Tests/RunCMake/include_directories/SourceDirectoryInInterface.cmake b/Tests/RunCMake/include_directories/SourceDirectoryInInterface.cmake
index f814a3c..c9a9c45 100644
--- a/Tests/RunCMake/include_directories/SourceDirectoryInInterface.cmake
+++ b/Tests/RunCMake/include_directories/SourceDirectoryInInterface.cmake
@@ -1,5 +1,5 @@
-enable_language(CXX)
+project(SourceDirectoryInInterface)
add_library(testTarget "${CMAKE_CURRENT_SOURCE_DIR}/empty.cpp")
target_include_directories(testTarget INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/foo")
diff --git a/Tests/RunCMake/include_directories/export-NOWARN.cmake b/Tests/RunCMake/include_directories/export-NOWARN.cmake
index 50720a0..307ce5a 100644
--- a/Tests/RunCMake/include_directories/export-NOWARN.cmake
+++ b/Tests/RunCMake/include_directories/export-NOWARN.cmake
@@ -1,4 +1,4 @@
-enable_language(CXX)
+
add_library(foo empty.cpp)
set_property(TARGET foo APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES $<0:>/include/subdir)
set_property(TARGET foo APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES $<INSTALL_PREFIX>/include/subdir)
diff --git a/Tests/RunCMake/include_directories/incomplete-genex.cmake b/Tests/RunCMake/include_directories/incomplete-genex.cmake
index 976695a..b6900a4 100644
--- a/Tests/RunCMake/include_directories/incomplete-genex.cmake
+++ b/Tests/RunCMake/include_directories/incomplete-genex.cmake
@@ -1,4 +1,4 @@
-enable_language(CXX)
+project(incomplete-genex)
cmake_policy(SET CMP0022 NEW)
cmake_policy(SET CMP0023 NEW)
-----------------------------------------------------------------------
Summary of changes:
Tests/RunCMake/include_directories/BinaryDirectoryInInterface.cmake | 2 +-
Tests/RunCMake/include_directories/CMakeLists.txt | 2 +-
Tests/RunCMake/include_directories/DebugIncludes.cmake | 2 +-
Tests/RunCMake/include_directories/DirInInstallPrefix.cmake | 2 +-
Tests/RunCMake/include_directories/ImportedTarget.cmake | 2 +-
Tests/RunCMake/include_directories/InstallPrefixInInterface.cmake | 2 +-
Tests/RunCMake/include_directories/RelativePathInGenex.cmake | 2 +-
Tests/RunCMake/include_directories/RelativePathInInterface.cmake | 2 +-
Tests/RunCMake/include_directories/SourceDirectoryInInterface.cmake | 2 +-
Tests/RunCMake/include_directories/export-NOWARN.cmake | 2 +-
Tests/RunCMake/include_directories/incomplete-genex.cmake | 2 +-
11 files changed, 11 insertions(+), 11 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list