[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-594-gaf064e5

[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  af064e58c0fdde06bb4f1c93d4c9e7acd94efc07 (commit)
       via  07747be837dfe4baf76d5af451841cb25b7ac9dc (commit)
      from  77ca7ea3169bdbd0e02b17bd7f2f3776dbdaab75 (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=af064e58c0fdde06bb4f1c93d4c9e7acd94efc07
commit af064e58c0fdde06bb4f1c93d4c9e7acd94efc07
Merge: 77ca7ea 07747be
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 27 09:24:36 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 27 09:24:36 2017 -0500

    Merge topic 'autogen_json_fix' into next
    
    07747be8 Revert "Autogen: Fix for Q_PLUGIN_METADATA change detection test"


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=07747be837dfe4baf76d5af451841cb25b7ac9dc
commit 07747be837dfe4baf76d5af451841cb25b7ac9dc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 27 09:24:21 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 27 09:24:21 2017 -0500

    Revert "Autogen: Fix for Q_PLUGIN_METADATA change detection test"
    
    This reverts commit 73ad60499b429f6e38de1a6b564300286c468477.

diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt
index dfecff7..257c187 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" 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)
+  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}")
 
   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