put some files back and place generated files in special folder for deps
This commit is contained in:
parent
36c16cd28e
commit
15c5c9c425
6
3rdparty/QtPropertyBrowser/.gitignore
vendored
6
3rdparty/QtPropertyBrowser/.gitignore
vendored
@ -29,9 +29,3 @@
|
|||||||
|
|
||||||
# Ignores 'build' in any sub folder
|
# Ignores 'build' in any sub folder
|
||||||
build/
|
build/
|
||||||
|
|
||||||
src/moc_*.cpp
|
|
||||||
src/*.moc
|
|
||||||
src/qrc_*.cpp
|
|
||||||
src/*_automoc.cpp
|
|
||||||
src/*_export.h
|
|
@ -27,10 +27,10 @@ execute_process(
|
|||||||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
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()
|
enable_testing()
|
||||||
|
|
||||||
add_subdirectory(3rdparty/QtPropertyBrowser)
|
add_subdirectory(3rdparty/QtPropertyBrowser generated/3rdparty/QtPropertyBrowser)
|
||||||
|
|
||||||
add_definitions("-DGIT_COMMIT_HASH=${GIT_COMMIT_HASH}")
|
add_definitions("-DGIT_COMMIT_HASH=${GIT_COMMIT_HASH}")
|
||||||
configure_file(
|
configure_file(
|
||||||
|
Loading…
Reference in New Issue
Block a user