[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-558-gfa67829

[Brad King]

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  fa678294b653cb39dda9e631e24aead5a308cb78 (commit)
       via  73ad60499b429f6e38de1a6b564300286c468477 (commit)
      from  617e34c8d5fed40eb5d1d99a4d1717c091c3ad2d (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=fa678294b653cb39dda9e631e24aead5a308cb78
commit fa678294b653cb39dda9e631e24aead5a308cb78
Merge: 617e34c 73ad604
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 24 13:33:54 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 24 13:33:54 2017 -0500

    Merge topic 'autogen_json_fix' into next
    
    73ad6049 Autogen: Fix for Q_PLUGIN_METADATA change detection test


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=73ad60499b429f6e38de1a6b564300286c468477
commit 73ad60499b429f6e38de1a6b564300286c468477
Author:     Sebastian Holtermann <sebholt at xwmw.org>
AuthorDate: Fri Feb 24 18:27:41 2017 +0100
Commit:     Sebastian Holtermann <sebholt at xwmw.org>
CommitDate: Fri Feb 24 19:24:39 2017 +0100

    Autogen: Fix for Q_PLUGIN_METADATA change detection test

diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt
index 257c187..dfecff7 100644
--- a/Tests/QtAutogen/CMakeLists.txt
+++ b/Tests/QtAutogen/CMakeLists.txt
@@ -233,10 +233,10 @@ if (NOT QT_TEST_VERSION STREQUAL 4)
 
   set(timeformat "%Y%j%H%M%S")
   set(mocPluginBinDir "${CMAKE_CURRENT_BINARY_DIR}/mocPlugin")
-  find_library(style_a_file "PluginStyleA" "${mocPluginBinDir}")
-  find_library(style_b_file "PluginStyleB" "${mocPluginBinDir}")
-  find_library(style_c_file "PluginStyleC" "${mocPluginBinDir}")
-  find_library(style_d_file "PluginStyleD" "${mocPluginBinDir}")
+  find_library(style_a_file "PluginStyleA" PATHS "${mocPluginBinDir}" NO_DEFAULT_PATH)
+  find_library(style_b_file "PluginStyleB" PATHS "${mocPluginBinDir}" NO_DEFAULT_PATH)
+  find_library(style_c_file "PluginStyleC" PATHS "${mocPluginBinDir}" NO_DEFAULT_PATH)
+  find_library(style_d_file "PluginStyleD" PATHS "${mocPluginBinDir}" NO_DEFAULT_PATH)
 
   file(TIMESTAMP "${style_a_file}" style_a_before "${timeformat}")
   file(TIMESTAMP "${style_b_file}" style_b_before "${timeformat}")

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

Summary of changes:
 Tests/QtAutogen/CMakeLists.txt |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake