[Cmake-commits] CMake branch, master, updated. v3.8.1-1176-g4717797

Kitware Robot kwrobot at kitware.com
Mon May 15 11:05:07 EDT 2017


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, master has been updated
       via  471779764757a3a6e4b5fb1db9b8943630b18f3d (commit)
       via  dd89b24b9b637ee58ffe60b24f6c3b3ddec5132c (commit)
       via  bedd098a65f30139eb2c1520d1d4b005e3b2c059 (commit)
       via  cda0baea495056c12c97262701c832e9b2a62bb4 (commit)
       via  263840681331b0b75ee179b27ec33bb909f4c98c (commit)
       via  6949b71ff13e222925c0939c50f669e23b6da785 (commit)
       via  3eb0f08084173f344851a36876864c58a301d5ea (commit)
       via  6a6cbd47fba7630844ed144aaf24f415afbdc72e (commit)
       via  b95fbbe55328d583f77280eca862a7951d19d836 (commit)
       via  ab39dd11f5ba134b56dc802584f33c2c46df7f09 (commit)
       via  2e293c39da969cc0c39503e1fef6310b4ef85d85 (commit)
      from  52fbae0a59d05f2724e77aff75c7761b685bae03 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=471779764757a3a6e4b5fb1db9b8943630b18f3d
commit 471779764757a3a6e4b5fb1db9b8943630b18f3d
Merge: dd89b24 6a6cbd4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon May 15 14:57:35 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon May 15 10:57:41 2017 -0400

    Merge topic 'fix-target-alias-doc-typo'
    
    6a6cbd47 Help: Fix typo in add_library(... ALIAS ...) text
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !840


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dd89b24b9b637ee58ffe60b24f6c3b3ddec5132c
commit dd89b24b9b637ee58ffe60b24f6c3b3ddec5132c
Merge: bedd098 b95fbbe
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon May 15 14:56:56 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon May 15 10:57:20 2017 -0400

    Merge topic 'autogen_settings'
    
    b95fbbe5 Autogen: Add -DWIN32 to definitions list on demand
    ab39dd11 Autogen: Include moc/uic/rcc binary in settings hash
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !836


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bedd098a65f30139eb2c1520d1d4b005e3b2c059
commit bedd098a65f30139eb2c1520d1d4b005e3b2c059
Merge: cda0bae 2638406
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon May 15 14:55:53 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon May 15 10:55:58 2017 -0400

    Merge topic 'cpack-components-handle-symlinks'
    
    26384068 CPack test symlinks in package
    6949b71f CPack unify component/monolithic package symlink handling
    3eb0f080 Improved CPack tests error logging
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !841


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cda0baea495056c12c97262701c832e9b2a62bb4
commit cda0baea495056c12c97262701c832e9b2a62bb4
Merge: 52fbae0 2e293c3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon May 15 14:54:45 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon May 15 10:55:10 2017 -0400

    Merge topic 'FindPkgConfig-fix-lib-search'
    
    2e293c39 FindPkgConfig: Fix pkg_check_modules() non-standard location search
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !835


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=263840681331b0b75ee179b27ec33bb909f4c98c
commit 263840681331b0b75ee179b27ec33bb909f4c98c
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Sun May 14 23:44:56 2017 +0200
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Sun May 14 23:45:18 2017 +0200

    CPack test symlinks in package

diff --git a/Tests/RunCMake/CPack/RunCMakeTest.cmake b/Tests/RunCMake/CPack/RunCMakeTest.cmake
index 8ca7126..752ce8a 100644
--- a/Tests/RunCMake/CPack/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CPack/RunCMakeTest.cmake
@@ -24,5 +24,6 @@ run_cpack_test_subtests(SINGLE_DEBUGINFO "no_main_component;one_component;one_co
 run_cpack_test(EXTRA_SLASH_IN_PATH "RPM" true "COMPONENT")
 run_cpack_source_test(SOURCE_PACKAGE "RPM")
 run_cpack_test(SUGGESTS "RPM" false "MONOLITHIC")
+run_cpack_test(SYMLINKS "RPM;TGZ" false "MONOLITHIC;COMPONENT")
 run_cpack_test(USER_FILELIST "RPM" false "MONOLITHIC")
 run_cpack_test(MD5SUMS "DEB" false "MONOLITHIC;COMPONENT")
diff --git a/Tests/RunCMake/CPack/tests/SYMLINKS/ExpectedFiles.cmake b/Tests/RunCMake/CPack/tests/SYMLINKS/ExpectedFiles.cmake
new file mode 100644
index 0000000..05be748
--- /dev/null
+++ b/Tests/RunCMake/CPack/tests/SYMLINKS/ExpectedFiles.cmake
@@ -0,0 +1,13 @@
+set(EXPECTED_FILES_COUNT "1")
+
+set(EXPECTED_FILE_CONTENT_1_LIST
+  "/usr"
+  "/usr/empty_dir"
+  "/usr/non_empty_dir"
+  "/usr/non_empty_dir/CMakeLists.txt"
+  "/usr/symlink_to_empty_dir"
+  "/usr/symlink_to_non_empty_dir")
+
+if(PACKAGING_TYPE STREQUAL "COMPONENT")
+  set(EXPECTED_FILE_1_COMPONENT "links")
+endif()
diff --git a/Tests/RunCMake/CPack/tests/SYMLINKS/TGZ-Prerequirements.cmake b/Tests/RunCMake/CPack/tests/SYMLINKS/TGZ-Prerequirements.cmake
new file mode 100644
index 0000000..f3df46b
--- /dev/null
+++ b/Tests/RunCMake/CPack/tests/SYMLINKS/TGZ-Prerequirements.cmake
@@ -0,0 +1,5 @@
+function(get_test_prerequirements found_var config_file)
+  if(UNIX) # limit test to platforms that support symlinks
+    set(${found_var} true PARENT_SCOPE)
+  endif()
+endfunction()
diff --git a/Tests/RunCMake/CPack/tests/SYMLINKS/VerifyResult.cmake b/Tests/RunCMake/CPack/tests/SYMLINKS/VerifyResult.cmake
new file mode 100644
index 0000000..0632319
--- /dev/null
+++ b/Tests/RunCMake/CPack/tests/SYMLINKS/VerifyResult.cmake
@@ -0,0 +1,26 @@
+set(whitespaces "[\\t\\n\\r ]*")
+
+#######################
+# verify generated symbolic links
+#######################
+file(GLOB_RECURSE symlink_files RELATIVE "${bin_dir}" "${bin_dir}/*/symlink_*")
+
+foreach(check_symlink IN LISTS symlink_files)
+  get_filename_component(symlink_name "${check_symlink}" NAME)
+  execute_process(COMMAND ls -la "${check_symlink}"
+            WORKING_DIRECTORY "${bin_dir}"
+            OUTPUT_VARIABLE SYMLINK_POINT_
+            OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+  if("${symlink_name}" STREQUAL "symlink_to_empty_dir")
+    string(REGEX MATCH "^.*${whitespaces}->${whitespaces}empty_dir$" check_symlink "${SYMLINK_POINT_}")
+  elseif("${symlink_name}" STREQUAL "symlink_to_non_empty_dir")
+    string(REGEX MATCH "^.*${whitespaces}->${whitespaces}non_empty_dir$" check_symlink "${SYMLINK_POINT_}")
+  else()
+    message(FATAL_ERROR "error: unexpected rpm symbolic link '${check_symlink}'")
+  endif()
+
+  if(NOT check_symlink)
+    message(FATAL_ERROR "symlink points to unexpected location '${SYMLINK_POINT_}'")
+  endif()
+endforeach()
diff --git a/Tests/RunCMake/CPack/tests/SYMLINKS/test.cmake b/Tests/RunCMake/CPack/tests/SYMLINKS/test.cmake
new file mode 100644
index 0000000..fef765c
--- /dev/null
+++ b/Tests/RunCMake/CPack/tests/SYMLINKS/test.cmake
@@ -0,0 +1,14 @@
+install(DIRECTORY DESTINATION empty_dir COMPONENT links)
+install(FILES CMakeLists.txt DESTINATION non_empty_dir COMPONENT links)
+
+# test symbolic link to an empty dir
+execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink empty_dir symlink_to_empty_dir)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/symlink_to_empty_dir DESTINATION "." COMPONENT links)
+
+# test symbolic link to a non empty dir
+execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink non_empty_dir symlink_to_non_empty_dir)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/symlink_to_non_empty_dir DESTINATION "." COMPONENT links)
+
+if(PACKAGING_TYPE STREQUAL "COMPONENT")
+  set(CPACK_COMPONENTS_ALL links)
+endif()

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6949b71ff13e222925c0939c50f669e23b6da785
commit 6949b71ff13e222925c0939c50f669e23b6da785
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Sun May 14 23:10:34 2017 +0200
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Sun May 14 23:45:18 2017 +0200

    CPack unify component/monolithic package symlink handling
    
    Non component package generation was recursing through
    symlinks while monolithic package generation did not.
    This was causing component archive packages to contain
    both symlink and a directory with the same name on the
    same level if symlink contained files which caused errors
    during extraction of such packages.
    
    Closes #16051

diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx
index c873529..3e113d3 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -795,6 +795,7 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects(
           cmsys::Glob glA;
           glA.RecurseOn();
           glA.SetRecurseListDirs(true);
+          glA.SetRecurseThroughSymlinks(false);
           glA.FindFiles(findExpr);
           std::vector<std::string> filesAfter = glA.GetFiles();
           std::sort(filesAfter.begin(), filesAfter.end());

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3eb0f08084173f344851a36876864c58a301d5ea
commit 3eb0f08084173f344851a36876864c58a301d5ea
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Sat May 13 23:19:51 2017 +0200
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Sun May 14 23:45:18 2017 +0200

    Improved CPack tests error logging

diff --git a/Tests/RunCMake/CPack/ArchiveCommon/common_helpers.cmake b/Tests/RunCMake/CPack/ArchiveCommon/common_helpers.cmake
index ce039f5..99d3155 100644
--- a/Tests/RunCMake/CPack/ArchiveCommon/common_helpers.cmake
+++ b/Tests/RunCMake/CPack/ArchiveCommon/common_helpers.cmake
@@ -33,7 +33,7 @@ function(getPackageContentList FILE RESULT_VAR)
 endfunction()
 
 function(toExpectedContentList FILE_NO CONTENT_VAR)
-  findExpectedFile("${FILE_NO}" "file_")
+  findExpectedFile("${FILE_NO}" "file_" "glob_expr_")
 
   # component and monolithic packages differ for some reason by either having
   # package filename prefix in path or not
diff --git a/Tests/RunCMake/CPack/STGZ/Helpers.cmake b/Tests/RunCMake/CPack/STGZ/Helpers.cmake
index 08224d3..68b1eab 100644
--- a/Tests/RunCMake/CPack/STGZ/Helpers.cmake
+++ b/Tests/RunCMake/CPack/STGZ/Helpers.cmake
@@ -35,7 +35,7 @@ function(getPackageContentList FILE RESULT_VAR)
 endfunction()
 
 function(toExpectedContentList FILE_NO CONTENT_VAR)
-  findExpectedFile("${FILE_NO}" "file_")
+  findExpectedFile("${FILE_NO}" "file_" "glob_expr_")
 
   get_filename_component(prefix_ "${file_}" NAME)
   # NAME_WE removes everything after the dot and dot is in version so replace instead
diff --git a/Tests/RunCMake/CPack/VerifyResult.cmake b/Tests/RunCMake/CPack/VerifyResult.cmake
index 59751a7..470ebf7 100644
--- a/Tests/RunCMake/CPack/VerifyResult.cmake
+++ b/Tests/RunCMake/CPack/VerifyResult.cmake
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION ${CMAKE_VERSION} FATAL_ERROR)
 
-function(findExpectedFile FILE_NO RESULT_VAR)
+function(findExpectedFile FILE_NO RESULT_VAR GLOBING_EXPR_VAR)
   if(NOT DEFINED EXPECTED_FILE_${FILE_NO}) # explicit file name regex was not provided - construct one from other data
     # set defaults if parameters are not provided
     if(NOT DEFINED EXPECTED_FILE_${FILE_NO}_NAME)
@@ -21,6 +21,7 @@ function(findExpectedFile FILE_NO RESULT_VAR)
   file(GLOB found_file_ RELATIVE "${bin_dir}" "${EXPECTED_FILE_${FILE_NO}}")
 
   set(${RESULT_VAR} "${found_file_}" PARENT_SCOPE)
+  set(${GLOBING_EXPR_VAR} "${EXPECTED_FILE_${FILE_NO}}" PARENT_SCOPE)
 endfunction()
 
 include("${config_file}")
@@ -39,7 +40,8 @@ include("${src_dir}/tests/${RunCMake_TEST_FILE_PREFIX}/ExpectedFiles.cmake")
 # check that expected generated files exist and contain expected content
 if(NOT EXPECTED_FILES_COUNT EQUAL 0)
   foreach(file_no_ RANGE 1 ${EXPECTED_FILES_COUNT})
-    findExpectedFile("${file_no_}" "FOUND_FILE_${file_no_}")
+    findExpectedFile("${file_no_}" "FOUND_FILE_${file_no_}"
+      "EXPECTED_FILE_${file_no_}")
     list(APPEND foundFiles_ "${FOUND_FILE_${file_no_}}")
     list(LENGTH FOUND_FILE_${file_no_} foundFilesCount_)
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6a6cbd47fba7630844ed144aaf24f415afbdc72e
commit 6a6cbd47fba7630844ed144aaf24f415afbdc72e
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Sun May 14 22:09:19 2017 +0200
Commit:     Gregor Jasny <gjasny at googlemail.com>
CommitDate: Sun May 14 22:09:19 2017 +0200

    Help: Fix typo in add_library(... ALIAS ...) text

diff --git a/Help/command/add_library.rst b/Help/command/add_library.rst
index 02788e3..de5335e 100644
--- a/Help/command/add_library.rst
+++ b/Help/command/add_library.rst
@@ -123,7 +123,7 @@ Alias Libraries
 
 Creates an :ref:`Alias Target <Alias Targets>`, such that ``<name>`` can be
 used to refer to ``<target>`` in subsequent commands.  The ``<name>`` does
-not appear in the generatedbuildsystem as a make target.  The ``<target>``
+not appear in the generated buildsystem as a make target.  The ``<target>``
 may not be an :ref:`Imported Target <Imported Targets>` or an ``ALIAS``.
 ``ALIAS`` targets can be used as linkable targets and as targets to
 read properties from.  They can also be tested for existence with the

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b95fbbe55328d583f77280eca862a7951d19d836
commit b95fbbe55328d583f77280eca862a7951d19d836
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Sat May 13 10:25:46 2017 +0200
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Sat May 13 10:25:46 2017 +0200

    Autogen: Add -DWIN32 to definitions list on demand

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 15d206a..d40e809 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -396,6 +396,14 @@ bool cmQtAutoGenerators::ReadAutogenInfoFile(
   if (this->MocEnabled()) {
     InfoGet(makefile, "AM_MOC_SKIP", this->MocSkipList);
     InfoGet(makefile, "AM_MOC_DEFINITIONS", config, this->MocDefinitions);
+#ifdef _WIN32
+    {
+      const std::string win32("WIN32");
+      if (!ListContains(this->MocDefinitions, win32)) {
+        this->MocDefinitions.push_back(win32);
+      }
+    }
+#endif
     InfoGet(makefile, "AM_MOC_INCLUDES", config, this->MocIncludePaths);
     InfoGet(makefile, "AM_MOC_OPTIONS", this->MocOptions);
     InfoGet(makefile, "AM_MOC_RELAXED_MODE", this->MocRelaxedMode);
@@ -1221,9 +1229,6 @@ bool cmQtAutoGenerators::MocGenerateAll(
                this->MocDefinitions.begin();
              it != this->MocDefinitions.end(); ++it) {
           cmd.push_back("-D" + (*it));
-#ifdef _WIN32
-          cmd.push_back("-DWIN32");
-#endif
         }
         // Add options
         cmd.insert(cmd.end(), this->MocOptions.begin(),
@@ -1369,9 +1374,6 @@ bool cmQtAutoGenerators::MocGenerateFile(
            it != this->MocDefinitions.end(); ++it) {
         cmd.push_back("-D" + (*it));
       }
-#ifdef _WIN32
-      cmd.push_back("-DWIN32");
-#endif
       // Add options
       cmd.insert(cmd.end(), this->MocOptions.begin(), this->MocOptions.end());
       // Add predefs include

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ab39dd11f5ba134b56dc802584f33c2c46df7f09
commit ab39dd11f5ba134b56dc802584f33c2c46df7f09
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Sat May 13 10:14:23 2017 +0200
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Sat May 13 10:14:23 2017 +0200

    Autogen: Include moc/uic/rcc binary in settings hash

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 7461a0a..15d206a 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -517,32 +517,39 @@ void cmQtAutoGenerators::SettingsFileRead(cmMakefile* makefile)
   // Compose current settings strings
   {
     cmCryptoHash crypt(cmCryptoHash::AlgoSHA256);
+    const std::string sep(" ~~~ ");
     if (this->MocEnabled()) {
       std::string str;
+      str += this->MocExecutable;
+      str += sep;
       str += JoinOptionsList(this->MocDefinitions);
-      str += " ~~~ ";
+      str += sep;
       str += JoinOptionsList(this->MocIncludePaths);
-      str += " ~~~ ";
+      str += sep;
       str += JoinOptionsList(this->MocOptions);
-      str += " ~~~ ";
+      str += sep;
       str += this->IncludeProjectDirsBefore ? "TRUE" : "FALSE";
-      str += " ~~~ ";
+      str += sep;
       str += JoinOptionsList(this->MocPredefsCmd);
-      str += " ~~~ ";
+      str += sep;
       this->SettingsStringMoc = crypt.HashString(str);
     }
     if (this->UicEnabled()) {
       std::string str;
+      str += this->UicExecutable;
+      str += sep;
       str += JoinOptionsList(this->UicTargetOptions);
-      str += " ~~~ ";
+      str += sep;
       str += JoinOptionsMap(this->UicOptions);
-      str += " ~~~ ";
+      str += sep;
       this->SettingsStringUic = crypt.HashString(str);
     }
     if (this->RccEnabled()) {
       std::string str;
+      str += this->RccExecutable;
+      str += sep;
       str += JoinOptionsMap(this->RccOptions);
-      str += " ~~~ ";
+      str += sep;
       this->SettingsStringRcc = crypt.HashString(str);
     }
   }

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2e293c39da969cc0c39503e1fef6310b4ef85d85
commit 2e293c39da969cc0c39503e1fef6310b4ef85d85
Author:     Yuriy Khokhulya <yuriy.khokhulya at apostera.com>
AuthorDate: Thu May 11 23:46:21 2017 +0300
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri May 12 09:21:21 2017 -0400

    FindPkgConfig: Fix pkg_check_modules() non-standard location search
    
    During search of the library file `pkg_check_modules()` attempts to find
    it in last specified library path in `${_prefix}_LDFLAGS`, that after
    dependency resolving contains path to standard location.
    
    So in case when `${_prefix}_LDFLAGS` has:
    
        -L/prefix;-L/usr/local/lib;-llibrary_from_prefix;-ldependency
    
    `library_from_prefix` will not be found.
    
    As solution need try to find the library in all paths preceding to the
    library.
    
    Fixes: #16873

diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
index 54572f0..12a5ded 100644
--- a/Modules/FindPkgConfig.cmake
+++ b/Modules/FindPkgConfig.cmake
@@ -190,10 +190,12 @@ function(_pkg_create_imp_target _prefix _no_cmake_path _no_cmake_environment_pat
     string(APPEND _find_opts " NO_CMAKE_ENVIRONMENT_PATH")
   endif()
 
+  unset(_search_paths)
   foreach (flag IN LISTS ${_prefix}_LDFLAGS)
     if (flag MATCHES "^-L(.*)")
       # only look into the given paths from now on
-      set(_find_opts HINTS ${CMAKE_MATCH_1} NO_DEFAULT_PATH)
+      list(APPEND _search_paths ${CMAKE_MATCH_1})
+      set(_find_opts HINTS ${_search_paths} NO_DEFAULT_PATH)
       continue()
     endif()
     if (flag MATCHES "^-l(.*)")

-----------------------------------------------------------------------

Summary of changes:
 Help/command/add_library.rst                       |    2 +-
 Modules/FindPkgConfig.cmake                        |    4 ++-
 Source/CPack/cmCPackGenerator.cxx                  |    1 +
 Source/cmQtAutoGenerators.cxx                      |   37 ++++++++++++--------
 .../CPack/ArchiveCommon/common_helpers.cmake       |    2 +-
 Tests/RunCMake/CPack/RunCMakeTest.cmake            |    1 +
 Tests/RunCMake/CPack/STGZ/Helpers.cmake            |    2 +-
 Tests/RunCMake/CPack/VerifyResult.cmake            |    6 ++--
 .../CPack/tests/SYMLINKS/ExpectedFiles.cmake       |   13 +++++++
 .../TGZ-Prerequirements.cmake}                     |    4 +--
 .../CPack/tests/SYMLINKS/VerifyResult.cmake        |   26 ++++++++++++++
 Tests/RunCMake/CPack/tests/SYMLINKS/test.cmake     |   14 ++++++++
 12 files changed, 89 insertions(+), 23 deletions(-)
 create mode 100644 Tests/RunCMake/CPack/tests/SYMLINKS/ExpectedFiles.cmake
 copy Tests/RunCMake/CPack/tests/{GENERATE_SHLIBS/DEB-Prerequirements.cmake => SYMLINKS/TGZ-Prerequirements.cmake} (67%)
 create mode 100644 Tests/RunCMake/CPack/tests/SYMLINKS/VerifyResult.cmake
 create mode 100644 Tests/RunCMake/CPack/tests/SYMLINKS/test.cmake


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list