diff options
| -rw-r--r-- | 3rdparty/QtPropertyBrowser/.gitignore | 6 | ||||
| -rw-r--r-- | CMakeLists.txt | 4 |
2 files changed, 2 insertions, 8 deletions
diff --git a/3rdparty/QtPropertyBrowser/.gitignore b/3rdparty/QtPropertyBrowser/.gitignore index 8472a980..b667c89b 100644 --- a/3rdparty/QtPropertyBrowser/.gitignore +++ b/3rdparty/QtPropertyBrowser/.gitignore @@ -29,9 +29,3 @@ # Ignores 'build' in any sub folder build/ - -src/moc_*.cpp -src/*.moc -src/qrc_*.cpp -src/*_automoc.cpp -src/*_export.h
\ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index be2edb62..ac58f169 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,10 +27,10 @@ execute_process( OUTPUT_STRIP_TRAILING_WHITESPACE ) -add_subdirectory(3rdparty/googletest/googletest EXCLUDE_FROM_ALL) +add_subdirectory(3rdparty/googletest/googletest generated/3rdparty/googletest EXCLUDE_FROM_ALL) enable_testing() -add_subdirectory(3rdparty/QtPropertyBrowser) +add_subdirectory(3rdparty/QtPropertyBrowser generated/3rdparty/QtPropertyBrowser) add_definitions("-DGIT_COMMIT_HASH=${GIT_COMMIT_HASH}") configure_file( |