diff options
| author | Stephen Kelly <steveire@gmail.com> | 2014-01-11 12:58:23 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2014-01-11 12:58:23 (GMT) |
| commit | dea71aae6d87189f935376bece28325316df4afc (patch) | |
| tree | a5391ae9af1580fad1eeae86f7c80c76a2e519b3 | |
| parent | cb7af7af44bd9ce5ac11e345b1756ea0770bbc83 (diff) | |
| download | CMake-dea71aae6d87189f935376bece28325316df4afc.zip CMake-dea71aae6d87189f935376bece28325316df4afc.tar.gz CMake-dea71aae6d87189f935376bece28325316df4afc.tar.bz2 | |
Tests: Fix find-package mode test.
The all target was depending on the clean and pngtest targets, but
when running the tests with -jN, those can be executed out of order.
Make the main.o target depend on the clean target instead to fix
this.
| -rw-r--r-- | Tests/FindPackageModeMakefileTest/Makefile.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Tests/FindPackageModeMakefileTest/Makefile.in b/Tests/FindPackageModeMakefileTest/Makefile.in index c91d8a0..e4df9d6 100644 --- a/Tests/FindPackageModeMakefileTest/Makefile.in +++ b/Tests/FindPackageModeMakefileTest/Makefile.in @@ -9,9 +9,9 @@ CMAKE_FOO = $(CMAKE) --find-package -DCMAKE_MODULE_PATH=$(CMAKE_CURRENT_BINARY_D tmp = tmp.txt -all: clean pngtest +all: pngtest -main.o: main.cpp +main.o: clean main.cpp @$(CMAKE_FOO) -DMODE=COMPILE >$(tmp) @foo="`cat $(tmp)`"; \ printf '"%s" %s %s -c main.cpp\n' $(CMAKE_CXX_COMPILER) "$(CXXFLAGS)" "$$foo" >$(tmp) |