summaryrefslogtreecommitdiffstats
path: root/Tests/QtAutogen
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-02-19 13:57:20 (GMT)
committerBrad King <brad.king@kitware.com>2016-02-19 13:59:17 (GMT)
commit091b649e198bade6fba7518b6c970bfa23b7365f (patch)
tree69ab88dcdd11d363e3353372fd1a16dc42f3c2f5 /Tests/QtAutogen
parent9beb2744d7685fca9cd5717308d4457dffdefcdc (diff)
downloadCMake-091b649e198bade6fba7518b6c970bfa23b7365f.zip
CMake-091b649e198bade6fba7518b6c970bfa23b7365f.tar.gz
CMake-091b649e198bade6fba7518b6c970bfa23b7365f.tar.bz2
Revert "Automoc: Fix support of files with the same name (#12873)"
This reverts commit 9beb2744d7685fca9cd5717308d4457dffdefcdc. Our AUTOMOC documentation states that it should be possible to `#include "moc_foo.cpp"` in `foo.cpp`, and this will not work if the file is placed in a different directory. Another solution will need to be found to the original problem. Reported-by: Stephen Kelly <steveire@gmail.com>
Diffstat (limited to 'Tests/QtAutogen')
-rw-r--r--Tests/QtAutogen/Adir/CMakeLists.txt2
-rw-r--r--Tests/QtAutogen/Adir/bar/foo.cpp4
-rw-r--r--Tests/QtAutogen/Adir/bar/foo.h10
-rw-r--r--Tests/QtAutogen/Adir/foo.cpp4
-rw-r--r--Tests/QtAutogen/Adir/foo.h8
5 files changed, 1 insertions, 27 deletions
diff --git a/Tests/QtAutogen/Adir/CMakeLists.txt b/Tests/QtAutogen/Adir/CMakeLists.txt
index 0c7848d..a1c36ff 100644
--- a/Tests/QtAutogen/Adir/CMakeLists.txt
+++ b/Tests/QtAutogen/Adir/CMakeLists.txt
@@ -3,6 +3,6 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_AUTOMOC ON)
set(CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE ON)
-add_library(libA SHARED libA.cpp foo.cpp bar/foo.cpp)
+add_library(libA SHARED libA.cpp)
target_link_libraries(libA LINK_PUBLIC ${QT_QTCORE_TARGET})
generate_export_header(libA)
diff --git a/Tests/QtAutogen/Adir/bar/foo.cpp b/Tests/QtAutogen/Adir/bar/foo.cpp
deleted file mode 100644
index 3f5e0a9..0000000
--- a/Tests/QtAutogen/Adir/bar/foo.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "foo.h"
-
-bar::foo::foo() {}
-bar::foo::~foo() {}
diff --git a/Tests/QtAutogen/Adir/bar/foo.h b/Tests/QtAutogen/Adir/bar/foo.h
deleted file mode 100644
index daf2367..0000000
--- a/Tests/QtAutogen/Adir/bar/foo.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <QObject>
-
-namespace bar {
- class foo: public QObject {
- Q_OBJECT
- public:
- foo();
- ~foo();
- };
-}
diff --git a/Tests/QtAutogen/Adir/foo.cpp b/Tests/QtAutogen/Adir/foo.cpp
deleted file mode 100644
index 86e4d8e..0000000
--- a/Tests/QtAutogen/Adir/foo.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "foo.h"
-
-foo::foo() {}
-foo::~foo() {}
diff --git a/Tests/QtAutogen/Adir/foo.h b/Tests/QtAutogen/Adir/foo.h
deleted file mode 100644
index a51960c..0000000
--- a/Tests/QtAutogen/Adir/foo.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <QObject>
-
-class foo: public QObject {
- Q_OBJECT
-public:
- foo();
- ~foo();
-};