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 7c07f54f7061bf77a809bf2890d6a89b8ae45d0f (commit)
via efe57573f6a6490506a9ef337d70d0ef7bee8cb2 (commit)
via fbd6da7452e19a289e176ca3195cbff5e9bc4ee4 (commit)
via a61c41cb4830e08403faa0bab4f4f983d5f12390 (commit)
from f9ae1e2f8eff0e8f155a98c0447526ea1760bcb3 (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=7c07f54f7061bf77a809bf2890d6a89b8ae45d0f
commit 7c07f54f7061bf77a809bf2890d6a89b8ae45d0f
Merge: f9ae1e2 efe5757
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Tue Aug 5 09:45:07 2014 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Aug 5 09:45:07 2014 -0400
Merge topic 'qt-automoc' into next
efe57573 Revert "Qt: Fix automoc when .h and .cpp are in different
directories."
fbd6da74 Revert "Qt: Enable running automoc test with Qt4 or Qt5."
a61c41cb Revert "Qt: Restore Qt4AndQt5Automoc test behavior."
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=efe57573f6a6490506a9ef337d70d0ef7bee8cb2
commit efe57573f6a6490506a9ef337d70d0ef7bee8cb2
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Tue Aug 5 07:44:42 2014 -0600
Commit: Clinton Stimpson <clin...@elemtech.com>
CommitDate: Tue Aug 5 07:44:42 2014 -0600
Revert "Qt: Fix automoc when .h and .cpp are in different directories."
This reverts commit cf4a7eb0272555119489b7eacd88eb785c496ce2.
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index 76edad5..d4d565c 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -1830,57 +1830,30 @@ cmQtAutoGenerators::SearchHeadersForCppFile(const
std::string& absFilename,
const std::string basename =
cmsys::SystemTools::GetFilenameWithoutLastExtension(absFilename);
const std::string absPath = cmsys::SystemTools::GetFilenamePath(
- cmsys::SystemTools::GetRealPath(absFilename.c_str()));
-
- std::vector<std::string> incPaths;
- incPaths.push_back(absPath);
- cmSystemTools::ExpandListArgument(this->MocIncludesStr, incPaths);
+ cmsys::SystemTools::GetRealPath(absFilename.c_str())) + '/';
- for(std::vector<std::string>::const_iterator path = incPaths.begin();
- path != incPaths.end();
- ++path)
- {
- bool found = false;
- for(std::vector<std::string>::const_iterator ext =
- headerExtensions.begin();
- ext != headerExtensions.end();
- ++ext)
+ for(std::vector<std::string>::const_iterator ext = headerExtensions.begin();
+ ext != headerExtensions.end();
+ ++ext)
{
- const std::string headerName = (*path) + "/" + basename + "." + (*ext);
-
- if (cmsys::SystemTools::FileExists(headerName.c_str()))
+ const std::string headerName = absPath + basename + "." + (*ext);
+ if (cmsys::SystemTools::FileExists(headerName.c_str()))
{
- absHeaders.insert(headerName);
- found = true;
- break;
+ absHeaders.insert(headerName);
+ break;
}
}
- if (found)
- break;
- }
- for(std::vector<std::string>::const_iterator path = incPaths.begin();
- path != incPaths.end();
- ++path)
- {
- bool found = false;
- for(std::vector<std::string>::const_iterator ext =
- headerExtensions.begin();
- ext != headerExtensions.end();
- ++ext)
+ for(std::vector<std::string>::const_iterator ext = headerExtensions.begin();
+ ext != headerExtensions.end();
+ ++ext)
{
- const std::string privateHeaderName = (*path) + "/" +
- basename + "_p." + (*ext);
-
- if (cmsys::SystemTools::FileExists(privateHeaderName.c_str()))
+ const std::string privateHeaderName = absPath+basename+"_p."+(*ext);
+ if (cmsys::SystemTools::FileExists(privateHeaderName.c_str()))
{
- absHeaders.insert(privateHeaderName);
- found = true;
- break;
+ absHeaders.insert(privateHeaderName);
+ break;
}
}
- if (found)
- break;
- }
}
diff --git a/Tests/Qt4And5Automoc/AnObject.cpp
b/Tests/Qt4And5Automoc/AnObject.cpp
deleted file mode 100644
index c1c93f1..0000000
--- a/Tests/Qt4And5Automoc/AnObject.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "AnObject.h"
-
-void AnObject::activated() {
-}
diff --git a/Tests/Qt4And5Automoc/AnObject.h b/Tests/Qt4And5Automoc/AnObject.h
deleted file mode 100644
index b7c5409..0000000
--- a/Tests/Qt4And5Automoc/AnObject.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <QObject>
-
-class AnObject : public QObject {
- Q_OBJECT
-public:
- AnObject() {}
-private slots:
- void activated();
-};
diff --git a/Tests/Qt4And5Automoc/CMakeLists.txt
b/Tests/Qt4And5Automoc/CMakeLists.txt
index 7f3e81e..ad74961 100644
--- a/Tests/Qt4And5Automoc/CMakeLists.txt
+++ b/Tests/Qt4And5Automoc/CMakeLists.txt
@@ -1,13 +1,13 @@
-cmake_minimum_required(VERSION 3.0.1)
+cmake_minimum_required(VERSION 2.8.12)
project(Qt4And5Automoc)
if (QT_REVERSE_FIND_ORDER)
- find_package(Qt5Core)
- find_package(Qt4)
+ find_package(Qt5Core REQUIRED)
+ find_package(Qt4 REQUIRED)
else()
- find_package(Qt4)
- find_package(Qt5Core)
+ find_package(Qt4 REQUIRED)
+ find_package(Qt5Core REQUIRED)
endif()
set(CMAKE_AUTOMOC ON)
@@ -20,16 +20,10 @@ macro(generate_main_file VERSION)
)
endmacro()
-include_directories(include)
-
-if (${QT4_FOUND})
generate_main_file(4)
-add_executable(qt4_exe "${CMAKE_CURRENT_BINARY_DIR}/main_qt4.cpp" AnObject.cpp
src/OtherObject.cpp)
-target_link_libraries(qt4_exe Qt4::QtCore)
-endif()
-
-if (${QT5_FOUND})
generate_main_file(5)
-add_executable(qt5_exe "${CMAKE_CURRENT_BINARY_DIR}/main_qt5.cpp" AnObject.cpp
src/OtherObject.cpp)
+
+add_executable(qt4_exe "${CMAKE_CURRENT_BINARY_DIR}/main_qt4.cpp")
+target_link_libraries(qt4_exe Qt4::QtCore)
+add_executable(qt5_exe "${CMAKE_CURRENT_BINARY_DIR}/main_qt5.cpp")
target_link_libraries(qt5_exe Qt5::Core)
-endif()
diff --git a/Tests/Qt4And5Automoc/include/OtherObject.h
b/Tests/Qt4And5Automoc/include/OtherObject.h
deleted file mode 100644
index 6d51cc1..0000000
--- a/Tests/Qt4And5Automoc/include/OtherObject.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <QObject>
-
-class OtherObject : public QObject {
- Q_OBJECT
-public:
- OtherObject() {}
-private slots:
- void activated();
-};
diff --git a/Tests/Qt4And5Automoc/main.cpp.in b/Tests/Qt4And5Automoc/main.cpp.in
index 7852cd6..00fd641 100644
--- a/Tests/Qt4And5Automoc/main.cpp.in
+++ b/Tests/Qt4And5Automoc/main.cpp.in
@@ -1,7 +1,5 @@
#include <QObject>
-#include "AnObject.h"
-#include "OtherObject.h"
class SomeObject : public QObject
{
@@ -16,7 +14,5 @@ public:
int main(int argc, char **argv)
{
- AnObject a;
- OtherObject o;
return 0;
}
diff --git a/Tests/Qt4And5Automoc/src/OtherObject.cpp
b/Tests/Qt4And5Automoc/src/OtherObject.cpp
deleted file mode 100644
index d4e724a..0000000
--- a/Tests/Qt4And5Automoc/src/OtherObject.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "OtherObject.h"
-
-void OtherObject::activated() {
-}
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fbd6da7452e19a289e176ca3195cbff5e9bc4ee4
commit fbd6da7452e19a289e176ca3195cbff5e9bc4ee4
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Tue Aug 5 07:44:34 2014 -0600
Commit: Clinton Stimpson <clin...@elemtech.com>
CommitDate: Tue Aug 5 07:44:34 2014 -0600
Revert "Qt: Enable running automoc test with Qt4 or Qt5."
This reverts commit c979c60c4386b844bfe0d2dc3a8e64da1318c561.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 1402c95..ca7fcdc 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1201,10 +1201,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P
${CMake_SOURCE_DIR}/Utilities/Release
)
list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt4Targets")
- endif()
-
- if((QT4_WORKS AND QT_QTGUI_FOUND) OR
- (Qt5Widgets_FOUND AND NOT Qt5Widgets_VERSION VERSION_LESS 5.1.0) )
+ if(Qt5Widgets_FOUND AND NOT Qt5Widgets_VERSION VERSION_LESS 5.1.0)
add_test(Qt4And5Automoc ${CMAKE_CTEST_COMMAND}
--build-and-test
"${CMake_SOURCE_DIR}/Tests/Qt4And5Automoc"
@@ -1229,6 +1226,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P
${CMake_SOURCE_DIR}/Utilities/Release
--test-command ${CMAKE_CTEST_COMMAND} -V
)
list(APPEND TEST_BUILD_DIRS
"${CMake_BINARY_DIR}/Tests/Qt4And5AutomocReverse")
+ endif()
endif()
find_package(GTK2 QUIET)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a61c41cb4830e08403faa0bab4f4f983d5f12390
commit a61c41cb4830e08403faa0bab4f4f983d5f12390
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Tue Aug 5 07:44:27 2014 -0600
Commit: Clinton Stimpson <clin...@elemtech.com>
CommitDate: Tue Aug 5 07:44:27 2014 -0600
Revert "Qt: Restore Qt4AndQt5Automoc test behavior."
This reverts commit 305c206900d7ada953e2b8de7709733f5c46cdf9.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index ca7fcdc..1402c95 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1201,7 +1201,10 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P
${CMake_SOURCE_DIR}/Utilities/Release
)
list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Qt4Targets")
- if(Qt5Widgets_FOUND AND NOT Qt5Widgets_VERSION VERSION_LESS 5.1.0)
+ endif()
+
+ if((QT4_WORKS AND QT_QTGUI_FOUND) OR
+ (Qt5Widgets_FOUND AND NOT Qt5Widgets_VERSION VERSION_LESS 5.1.0) )
add_test(Qt4And5Automoc ${CMAKE_CTEST_COMMAND}
--build-and-test
"${CMake_SOURCE_DIR}/Tests/Qt4And5Automoc"
@@ -1226,7 +1229,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P
${CMake_SOURCE_DIR}/Utilities/Release
--test-command ${CMAKE_CTEST_COMMAND} -V
)
list(APPEND TEST_BUILD_DIRS
"${CMake_BINARY_DIR}/Tests/Qt4And5AutomocReverse")
- endif()
endif()
find_package(GTK2 QUIET)
diff --git a/Tests/Qt4And5Automoc/CMakeLists.txt
b/Tests/Qt4And5Automoc/CMakeLists.txt
index 34c8115..7f3e81e 100644
--- a/Tests/Qt4And5Automoc/CMakeLists.txt
+++ b/Tests/Qt4And5Automoc/CMakeLists.txt
@@ -3,11 +3,11 @@ cmake_minimum_required(VERSION 3.0.1)
project(Qt4And5Automoc)
if (QT_REVERSE_FIND_ORDER)
- find_package(Qt5Core REQUIRED)
- find_package(Qt4 REQUIRED)
+ find_package(Qt5Core)
+ find_package(Qt4)
else()
- find_package(Qt4 REQUIRED)
- find_package(Qt5Core REQUIRED)
+ find_package(Qt4)
+ find_package(Qt5Core)
endif()
set(CMAKE_AUTOMOC ON)
@@ -22,10 +22,14 @@ endmacro()
include_directories(include)
+if (${QT4_FOUND})
generate_main_file(4)
add_executable(qt4_exe "${CMAKE_CURRENT_BINARY_DIR}/main_qt4.cpp" AnObject.cpp
src/OtherObject.cpp)
target_link_libraries(qt4_exe Qt4::QtCore)
+endif()
+if (${QT5_FOUND})
generate_main_file(5)
add_executable(qt5_exe "${CMAKE_CURRENT_BINARY_DIR}/main_qt5.cpp" AnObject.cpp
src/OtherObject.cpp)
target_link_libraries(qt5_exe Qt5::Core)
+endif()
-----------------------------------------------------------------------
Summary of changes:
Source/cmQtAutoGenerators.cxx | 57 ++++++++--------------------
Tests/Qt4And5Automoc/AnObject.cpp | 4 --
Tests/Qt4And5Automoc/AnObject.h | 9 -----
Tests/Qt4And5Automoc/CMakeLists.txt | 12 +++---
Tests/Qt4And5Automoc/include/OtherObject.h | 9 -----
Tests/Qt4And5Automoc/main.cpp.in | 4 --
Tests/Qt4And5Automoc/src/OtherObject.cpp | 4 --
7 files changed, 20 insertions(+), 79 deletions(-)
delete mode 100644 Tests/Qt4And5Automoc/AnObject.cpp
delete mode 100644 Tests/Qt4And5Automoc/AnObject.h
delete mode 100644 Tests/Qt4And5Automoc/include/OtherObject.h
delete mode 100644 Tests/Qt4And5Automoc/src/OtherObject.cpp
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
