diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | dispatch/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | gui/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | thirdparty/libbacktrace/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | wrappers/CMakeLists.txt | 3 |
5 files changed, 5 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 04f57233..00c71d4b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -393,8 +393,6 @@ include_directories (BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/khronos) # Common libraries / utilities include_directories ( - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/common ) diff --git a/dispatch/CMakeLists.txt b/dispatch/CMakeLists.txt index fc04520e..d023e6e9 100644 --- a/dispatch/CMakeLists.txt +++ b/dispatch/CMakeLists.txt @@ -1,10 +1,7 @@ ############################################################################## # Dispatch -include_directories ( - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_SOURCE_DIR} -) +set (CMAKE_INCLUDE_CURRENT_DIR ON) add_custom_command ( OUTPUT diff --git a/gui/CMakeLists.txt b/gui/CMakeLists.txt index 5eb14a42..7bce4eb3 100644 --- a/gui/CMakeLists.txt +++ b/gui/CMakeLists.txt @@ -56,9 +56,6 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) #add_app_icon(qapitrace_SRCS ../icons/hi*-qapitrace.png) include_directories( - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_SOURCE_DIR} ${QT5WIDGETS_INCLUDE_DIRS} ${QT5WEBKITWIDGETS_INCLUDE_DIRS} ) diff --git a/thirdparty/libbacktrace/CMakeLists.txt b/thirdparty/libbacktrace/CMakeLists.txt index 5f9c0b02..02415720 100644 --- a/thirdparty/libbacktrace/CMakeLists.txt +++ b/thirdparty/libbacktrace/CMakeLists.txt @@ -127,9 +127,8 @@ configure_file (backtrace-supported.h.in backtrace-supported.h) configure_file (config.h.in.cmake config.h) -include_directories (BEFORE - ${CMAKE_CURRENT_BINARY_DIR} -) +set (CMAKE_INCLUDE_CURRENT_DIR ON) + include_directories ( auxincl ) diff --git a/wrappers/CMakeLists.txt b/wrappers/CMakeLists.txt index 692fd619..9aaf2461 100644 --- a/wrappers/CMakeLists.txt +++ b/wrappers/CMakeLists.txt @@ -2,8 +2,9 @@ # API tracers +set (CMAKE_INCLUDE_CURRENT_DIR ON) + include_directories ( - ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/helpers ${CMAKE_BINARY_DIR}/dispatch ${CMAKE_SOURCE_DIR}/dispatch |