[Cmake-commits] CMake branch, next, updated. v3.0.0-rc6-3339-gded4f40
Nils Gladitz
nilsgladitz at gmail.com
Fri May 23 14:35:36 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 ded4f4084e96e2f7e5506a9ffc8b4f6eb8332841 (commit)
via a2124e435dc0b3e354eb191f4a56464a09092f40 (commit)
via e0d60d75b23542b6faedc166c58a142e2f2886c9 (commit)
via e0eab55dd35b5d721a781281e04e3fdb344ac711 (commit)
from 23da88d92ff4ea2aa0cf311f611e21ba3e8b785f (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=ded4f4084e96e2f7e5506a9ffc8b4f6eb8332841
commit ded4f4084e96e2f7e5506a9ffc8b4f6eb8332841
Merge: 23da88d a2124e4
Author: Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Fri May 23 14:35:35 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri May 23 14:35:35 2014 -0400
Merge topic 'cpack-properties' into next
a2124e43 CPack: Use default configuration "Debug" for verification
e0d60d75 CPack: Single config generators don't need per config sections
e0eab55d CPack: Turn CPackInstallProperties test into RunCMake sub-test
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a2124e435dc0b3e354eb191f4a56464a09092f40
commit a2124e435dc0b3e354eb191f4a56464a09092f40
Author: Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Fri May 23 20:32:35 2014 +0200
Commit: Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Fri May 23 20:32:35 2014 +0200
CPack: Use default configuration "Debug" for verification
diff --git a/Tests/RunCMake/CPackInstallProperties/check.cmake b/Tests/RunCMake/CPackInstallProperties/check.cmake
index a202da3..8c6ef2b 100644
--- a/Tests/RunCMake/CPackInstallProperties/check.cmake
+++ b/Tests/RunCMake/CPackInstallProperties/check.cmake
@@ -6,6 +6,7 @@ function(test_property FILE NAME EXPECTED_VALUE)
endif()
endfunction()
+set(CPACK_BUILD_CONFIG Debug)
include(${RunCMake_TEST_BINARY_DIR}/CPackProperties.cmake)
include(${RunCMake_TEST_BINARY_DIR}/runtest_info.cmake OPTIONAL)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e0d60d75b23542b6faedc166c58a142e2f2886c9
commit e0d60d75b23542b6faedc166c58a142e2f2886c9
Author: Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Fri May 23 19:11:19 2014 +0200
Commit: Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Fri May 23 19:11:19 2014 +0200
CPack: Single config generators don't need per config sections
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index a71d76f..dba4f46 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -3032,7 +3032,7 @@ bool cmGlobalGenerator::GenerateCPackPropertiesFile()
cmMakefile* mf = this->LocalGenerators[0]->GetMakefile();
std::vector<std::string> configs;
- std::string config = mf->GetConfigurations(configs);
+ std::string config = mf->GetConfigurations(configs, false);
std::string path = this->CMakeInstance->GetStartOutputDirectory();
path += "/CPackProperties.cmake";
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e0eab55dd35b5d721a781281e04e3fdb344ac711
commit e0eab55dd35b5d721a781281e04e3fdb344ac711
Author: Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Fri May 23 19:10:20 2014 +0200
Commit: Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Fri May 23 19:10:20 2014 +0200
CPack: Turn CPackInstallProperties test into RunCMake sub-test
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 8953222..695aacb 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -809,8 +809,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
"-DCMAKE_INSTALL_PREFIX:PATH=${MissingInstallInstallDir}")
list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/MissingInstall")
- ADD_TEST_MACRO(CPackInstallProperties ${CMAKE_CMAKE_COMMAND} -P runtest.cmake)
-
# By default, run the CPackComponents test if the CTEST_TEST_CPACK
# option is ON:
#
diff --git a/Tests/CPackInstallProperties/CMakeLists.txt b/Tests/CPackInstallProperties/CMakeLists.txt
deleted file mode 100644
index ad4bbe1..0000000
--- a/Tests/CPackInstallProperties/CMakeLists.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-cmake_minimum_required(VERSION 3.0)
-
-project(CPackInstallProperties)
-
-add_executable(mytest test.cpp)
-
-# Simple property
-set_property(INSTALL foo/test.cpp PROPERTY CPACK_TEST_PROP PROP_VALUE)
-
-# Filename with genex
-set_property(INSTALL $<TARGET_FILE_NAME:mytest> PROPERTY CPACK_TEST_PROP2 PROP_VALUE2)
-
-# Value with genex
-set_property(INSTALL bar/test.cpp PROPERTY CPACK_TEST_PROP $<TARGET_FILE_NAME:mytest>)
-
-# Multiple values
-set_property(INSTALL multiple_values.txt PROPERTY CPACK_TEST_PROP value1 value2 value3)
-
-# Append
-set_property(INSTALL append.txt PROPERTY CPACK_TEST_PROP value1)
-set_property(INSTALL append.txt PROPERTY CPACK_TEST_PROP value2 value3 APPEND)
-
-# Replace
-set_property(INSTALL replace.txt PROPERTY CPACK_TEST_PROP value1)
-set_property(INSTALL replace.txt PROPERTY CPACK_TEST_PROP value2)
-
-include(CPack)
-
-file(GENERATE OUTPUT runtest_info.cmake CONTENT [[
-set(EXPECTED_MYTEST_NAME "$<TARGET_FILE_NAME:mytest>")
-]])
-
-configure_file(runtest.cmake runtest.cmake COPYONLY)
diff --git a/Tests/CPackInstallProperties/runtest.cmake b/Tests/CPackInstallProperties/runtest.cmake
deleted file mode 100644
index a2282a0..0000000
--- a/Tests/CPackInstallProperties/runtest.cmake
+++ /dev/null
@@ -1,18 +0,0 @@
-include(runtest_info.cmake)
-
-function(test_property FILE NAME EXPECTED_VALUE)
- get_property(ACTUAL_VALUE INSTALL "${FILE}" PROPERTY "${NAME}")
-
- if(NOT "${ACTUAL_VALUE}" STREQUAL "${EXPECTED_VALUE}")
- message(FATAL_ERROR "${NAME}@${FILE}: property mismatch expected [${EXPECTED_VALUE}] actual [${ACTUAL_VALUE}]")
- endif()
-endfunction()
-
-include(CPackProperties.cmake)
-
-test_property("foo/test.cpp" CPACK_TEST_PROP PROP_VALUE)
-test_property(${EXPECTED_MYTEST_NAME} CPACK_TEST_PROP2 PROP_VALUE2)
-test_property("bar/test.cpp" CPACK_TEST_PROP ${EXPECTED_MYTEST_NAME})
-test_property("multiple_values.txt" CPACK_TEST_PROP "value1;value2;value3")
-test_property("append.txt" CPACK_TEST_PROP "value1;value2;value3")
-test_property("replace.txt" CPACK_TEST_PROP "value2")
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 7f6ebf1..07ed397 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -132,3 +132,4 @@ add_RunCMake_test(CheckModules)
add_RunCMake_test(CommandLine)
add_RunCMake_test(install)
+add_RunCMake_test(CPackInstallProperties)
diff --git a/Tests/RunCMake/CPackInstallProperties/Append-check.cmake b/Tests/RunCMake/CPackInstallProperties/Append-check.cmake
new file mode 100644
index 0000000..017b30d
--- /dev/null
+++ b/Tests/RunCMake/CPackInstallProperties/Append-check.cmake
@@ -0,0 +1,3 @@
+include(${RunCMake_SOURCE_DIR}/check.cmake)
+
+test_property("append.txt" CPACK_TEST_PROP "value1;value2;value3")
diff --git a/Tests/RunCMake/CPackInstallProperties/Append.cmake b/Tests/RunCMake/CPackInstallProperties/Append.cmake
new file mode 100644
index 0000000..cecc45f
--- /dev/null
+++ b/Tests/RunCMake/CPackInstallProperties/Append.cmake
@@ -0,0 +1,2 @@
+set_property(INSTALL append.txt PROPERTY CPACK_TEST_PROP value1)
+set_property(INSTALL append.txt PROPERTY CPACK_TEST_PROP value2 value3 APPEND)
diff --git a/Tests/RunCMake/CPackInstallProperties/CMakeLists.txt b/Tests/RunCMake/CPackInstallProperties/CMakeLists.txt
new file mode 100644
index 0000000..89ff7c4
--- /dev/null
+++ b/Tests/RunCMake/CPackInstallProperties/CMakeLists.txt
@@ -0,0 +1,6 @@
+cmake_minimum_required(VERSION 3.0)
+
+project(${RunCMake_TEST} CXX)
+include(${RunCMake_TEST}.cmake)
+
+include(CPack)
diff --git a/Tests/RunCMake/CPackInstallProperties/FilenameGenex-check.cmake b/Tests/RunCMake/CPackInstallProperties/FilenameGenex-check.cmake
new file mode 100644
index 0000000..8c9e967
--- /dev/null
+++ b/Tests/RunCMake/CPackInstallProperties/FilenameGenex-check.cmake
@@ -0,0 +1,3 @@
+include(${RunCMake_SOURCE_DIR}/check.cmake)
+
+test_property(${EXPECTED_MYTEST_NAME} CPACK_TEST_PROP2 PROP_VALUE2)
diff --git a/Tests/RunCMake/CPackInstallProperties/FilenameGenex.cmake b/Tests/RunCMake/CPackInstallProperties/FilenameGenex.cmake
new file mode 100644
index 0000000..1a373b9
--- /dev/null
+++ b/Tests/RunCMake/CPackInstallProperties/FilenameGenex.cmake
@@ -0,0 +1,7 @@
+add_executable(mytest test.cpp)
+
+file(GENERATE OUTPUT runtest_info.cmake CONTENT [[
+set(EXPECTED_MYTEST_NAME "$<TARGET_FILE_NAME:mytest>")
+]])
+
+set_property(INSTALL $<TARGET_FILE_NAME:mytest> PROPERTY CPACK_TEST_PROP2 PROP_VALUE2)
diff --git a/Tests/RunCMake/CPackInstallProperties/MultipleValues-check.cmake b/Tests/RunCMake/CPackInstallProperties/MultipleValues-check.cmake
new file mode 100644
index 0000000..91278ba
--- /dev/null
+++ b/Tests/RunCMake/CPackInstallProperties/MultipleValues-check.cmake
@@ -0,0 +1,3 @@
+include(${RunCMake_SOURCE_DIR}/check.cmake)
+
+test_property("multiple_values.txt" CPACK_TEST_PROP "value1;value2;value3")
diff --git a/Tests/RunCMake/CPackInstallProperties/MultipleValues.cmake b/Tests/RunCMake/CPackInstallProperties/MultipleValues.cmake
new file mode 100644
index 0000000..26db52a
--- /dev/null
+++ b/Tests/RunCMake/CPackInstallProperties/MultipleValues.cmake
@@ -0,0 +1 @@
+set_property(INSTALL multiple_values.txt PROPERTY CPACK_TEST_PROP value1 value2 value3)
diff --git a/Tests/RunCMake/CPackInstallProperties/Replace-check.cmake b/Tests/RunCMake/CPackInstallProperties/Replace-check.cmake
new file mode 100644
index 0000000..6e492e7
--- /dev/null
+++ b/Tests/RunCMake/CPackInstallProperties/Replace-check.cmake
@@ -0,0 +1,3 @@
+include(${RunCMake_SOURCE_DIR}/check.cmake)
+
+test_property("replace.txt" CPACK_TEST_PROP "value2")
diff --git a/Tests/RunCMake/CPackInstallProperties/Replace.cmake b/Tests/RunCMake/CPackInstallProperties/Replace.cmake
new file mode 100644
index 0000000..104d5a4
--- /dev/null
+++ b/Tests/RunCMake/CPackInstallProperties/Replace.cmake
@@ -0,0 +1,2 @@
+set_property(INSTALL replace.txt PROPERTY CPACK_TEST_PROP value1)
+set_property(INSTALL replace.txt PROPERTY CPACK_TEST_PROP value2)
diff --git a/Tests/RunCMake/CPackInstallProperties/RunCMakeTest.cmake b/Tests/RunCMake/CPackInstallProperties/RunCMakeTest.cmake
new file mode 100644
index 0000000..0d604a8
--- /dev/null
+++ b/Tests/RunCMake/CPackInstallProperties/RunCMakeTest.cmake
@@ -0,0 +1,8 @@
+include(RunCMake)
+
+run_cmake(Simple)
+run_cmake(FilenameGenex)
+run_cmake(ValueGenex)
+run_cmake(MultipleValues)
+run_cmake(Append)
+run_cmake(Replace)
diff --git a/Tests/RunCMake/CPackInstallProperties/Simple-check.cmake b/Tests/RunCMake/CPackInstallProperties/Simple-check.cmake
new file mode 100644
index 0000000..6a7ee2a
--- /dev/null
+++ b/Tests/RunCMake/CPackInstallProperties/Simple-check.cmake
@@ -0,0 +1,3 @@
+include(${RunCMake_SOURCE_DIR}/check.cmake)
+
+test_property("foo/test.cpp" CPACK_TEST_PROP PROP_VALUE)
diff --git a/Tests/RunCMake/CPackInstallProperties/Simple.cmake b/Tests/RunCMake/CPackInstallProperties/Simple.cmake
new file mode 100644
index 0000000..2eb8755
--- /dev/null
+++ b/Tests/RunCMake/CPackInstallProperties/Simple.cmake
@@ -0,0 +1 @@
+set_property(INSTALL foo/test.cpp PROPERTY CPACK_TEST_PROP PROP_VALUE)
diff --git a/Tests/RunCMake/CPackInstallProperties/ValueGenex-check.cmake b/Tests/RunCMake/CPackInstallProperties/ValueGenex-check.cmake
new file mode 100644
index 0000000..cdfbcda
--- /dev/null
+++ b/Tests/RunCMake/CPackInstallProperties/ValueGenex-check.cmake
@@ -0,0 +1,3 @@
+include(${RunCMake_SOURCE_DIR}/check.cmake)
+
+test_property("bar/test.cpp" CPACK_TEST_PROP ${EXPECTED_MYTEST_NAME})
diff --git a/Tests/RunCMake/CPackInstallProperties/ValueGenex.cmake b/Tests/RunCMake/CPackInstallProperties/ValueGenex.cmake
new file mode 100644
index 0000000..2e1d465
--- /dev/null
+++ b/Tests/RunCMake/CPackInstallProperties/ValueGenex.cmake
@@ -0,0 +1,7 @@
+add_executable(mytest test.cpp)
+
+file(GENERATE OUTPUT runtest_info.cmake CONTENT [[
+set(EXPECTED_MYTEST_NAME "$<TARGET_FILE_NAME:mytest>")
+]])
+
+set_property(INSTALL bar/test.cpp PROPERTY CPACK_TEST_PROP $<TARGET_FILE_NAME:mytest>)
diff --git a/Tests/RunCMake/CPackInstallProperties/check.cmake b/Tests/RunCMake/CPackInstallProperties/check.cmake
new file mode 100644
index 0000000..a202da3
--- /dev/null
+++ b/Tests/RunCMake/CPackInstallProperties/check.cmake
@@ -0,0 +1,11 @@
+function(test_property FILE NAME EXPECTED_VALUE)
+ get_property(ACTUAL_VALUE INSTALL "${FILE}" PROPERTY "${NAME}")
+
+ if(NOT "${ACTUAL_VALUE}" STREQUAL "${EXPECTED_VALUE}")
+ message(FATAL_ERROR "${NAME}@${FILE}: property mismatch expected [${EXPECTED_VALUE}] actual [${ACTUAL_VALUE}]")
+ endif()
+endfunction()
+
+include(${RunCMake_TEST_BINARY_DIR}/CPackProperties.cmake)
+
+include(${RunCMake_TEST_BINARY_DIR}/runtest_info.cmake OPTIONAL)
diff --git a/Tests/CPackInstallProperties/test.cpp b/Tests/RunCMake/CPackInstallProperties/test.cpp
similarity index 100%
rename from Tests/CPackInstallProperties/test.cpp
rename to Tests/RunCMake/CPackInstallProperties/test.cpp
-----------------------------------------------------------------------
Summary of changes:
Source/cmGlobalGenerator.cxx | 2 +-
Tests/CMakeLists.txt | 2 --
Tests/CPackInstallProperties/CMakeLists.txt | 33 --------------------
Tests/CPackInstallProperties/runtest.cmake | 18 -----------
Tests/RunCMake/CMakeLists.txt | 1 +
.../CPackInstallProperties/Append-check.cmake | 3 ++
Tests/RunCMake/CPackInstallProperties/Append.cmake | 2 ++
.../CMakeLists.txt | 3 ++
.../FilenameGenex-check.cmake | 3 ++
.../CPackInstallProperties/FilenameGenex.cmake | 7 +++++
.../MultipleValues-check.cmake | 3 ++
.../CPackInstallProperties/MultipleValues.cmake | 1 +
.../CPackInstallProperties/Replace-check.cmake | 3 ++
.../RunCMake/CPackInstallProperties/Replace.cmake | 2 ++
.../CPackInstallProperties/RunCMakeTest.cmake | 8 +++++
.../CPackInstallProperties/Simple-check.cmake | 3 ++
Tests/RunCMake/CPackInstallProperties/Simple.cmake | 1 +
.../CPackInstallProperties/ValueGenex-check.cmake | 3 ++
.../CPackInstallProperties/ValueGenex.cmake | 7 +++++
Tests/RunCMake/CPackInstallProperties/check.cmake | 12 +++++++
.../{ => RunCMake}/CPackInstallProperties/test.cpp | 0
21 files changed, 63 insertions(+), 54 deletions(-)
delete mode 100644 Tests/CPackInstallProperties/CMakeLists.txt
delete mode 100644 Tests/CPackInstallProperties/runtest.cmake
create mode 100644 Tests/RunCMake/CPackInstallProperties/Append-check.cmake
create mode 100644 Tests/RunCMake/CPackInstallProperties/Append.cmake
copy Tests/RunCMake/{CMP0051 => CPackInstallProperties}/CMakeLists.txt (85%)
create mode 100644 Tests/RunCMake/CPackInstallProperties/FilenameGenex-check.cmake
create mode 100644 Tests/RunCMake/CPackInstallProperties/FilenameGenex.cmake
create mode 100644 Tests/RunCMake/CPackInstallProperties/MultipleValues-check.cmake
create mode 100644 Tests/RunCMake/CPackInstallProperties/MultipleValues.cmake
create mode 100644 Tests/RunCMake/CPackInstallProperties/Replace-check.cmake
create mode 100644 Tests/RunCMake/CPackInstallProperties/Replace.cmake
create mode 100644 Tests/RunCMake/CPackInstallProperties/RunCMakeTest.cmake
create mode 100644 Tests/RunCMake/CPackInstallProperties/Simple-check.cmake
create mode 100644 Tests/RunCMake/CPackInstallProperties/Simple.cmake
create mode 100644 Tests/RunCMake/CPackInstallProperties/ValueGenex-check.cmake
create mode 100644 Tests/RunCMake/CPackInstallProperties/ValueGenex.cmake
create mode 100644 Tests/RunCMake/CPackInstallProperties/check.cmake
rename Tests/{ => RunCMake}/CPackInstallProperties/test.cpp (100%)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list