diff options
| author | Miodrag Milanovic <mmicko@gmail.com> | 2018-06-20 16:23:07 +0200 |
|---|---|---|
| committer | Miodrag Milanovic <mmicko@gmail.com> | 2018-06-20 16:23:07 +0200 |
| commit | 15c5c9c42549f61679a6a145d41f0d84208d457d (patch) | |
| tree | 212e658605bb56ad3530f28ca607eeb92155d091 | |
| parent | 36c16cd28e20b362a6185ce52525c98fc187ecf3 (diff) | |
| download | nextpnr-15c5c9c42549f61679a6a145d41f0d84208d457d.tar.gz nextpnr-15c5c9c42549f61679a6a145d41f0d84208d457d.tar.bz2 nextpnr-15c5c9c42549f61679a6a145d41f0d84208d457d.zip | |
put some files back and place generated files in special folder for deps
| -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( |