From 77016a619fccea343c0392838da44461fed3c729 Mon Sep 17 00:00:00 2001
From: David Faure <david.faure@kdab.com>
Date: Mon, 23 Nov 2020 21:16:40 +0100
Subject: [PATCH] Fixes for being used as a subproject

* Don't use CMAKE_SOURCE_DIR, always use CMAKE_CURRENT_SOURCE_DIR
* -Werror=undef found that #if was used instead of #ifdef
---
 docs/api/CMakeLists.txt                  | 2 +-
 src/private/WindowBeingDragged.cpp       | 2 +-
 src/private/WindowBeingDragged_p.h       | 2 +-
 src/private/multisplitter/CMakeLists.txt | 2 +-
 tests/CMakeLists.txt                     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/api/CMakeLists.txt b/docs/api/CMakeLists.txt
index c8a1b97a..7856e293 100644
--- a/docs/api/CMakeLists.txt
+++ b/docs/api/CMakeLists.txt
@@ -31,7 +31,7 @@ add_custom_command(
   OUTPUT ${DOXYGEN_OUTPUT_DIR}/qch/kddockwidgets-api.qch
   COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
   #handle a bug in doxygen where image files referred to in markdown are not copied the output
-  COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_SOURCE_DIR}/screencap.gif ${DOXYGEN_OUTPUT_DIR}/html
+  COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/../../screencap.gif ${DOXYGEN_OUTPUT_DIR}/html
   DEPENDS ${_dox_deps} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
   WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
 )
diff --git a/src/private/WindowBeingDragged.cpp b/src/private/WindowBeingDragged.cpp
index 9cea34ff..573b64c6 100644
--- a/src/private/WindowBeingDragged.cpp
+++ b/src/private/WindowBeingDragged.cpp
@@ -81,7 +81,7 @@ WindowBeingDragged::WindowBeingDragged(Draggable *draggable)
     }
 }
 
-#if DOCKS_DEVELOPER_MODE
+#ifdef DOCKS_DEVELOPER_MODE
 
 // Just used by tests
 WindowBeingDragged::WindowBeingDragged(FloatingWindow *fw)
diff --git a/src/private/WindowBeingDragged_p.h b/src/private/WindowBeingDragged_p.h
index 86349bbe..f49b7b3b 100644
--- a/src/private/WindowBeingDragged_p.h
+++ b/src/private/WindowBeingDragged_p.h
@@ -32,7 +32,7 @@ struct DOCKS_EXPORT_FOR_UNIT_TESTS WindowBeingDragged
 public:
     explicit WindowBeingDragged(FloatingWindow *fw, Draggable *draggable);
 
-#if DOCKS_DEVELOPER_MODE
+#ifdef DOCKS_DEVELOPER_MODE
     // For tests.
     explicit WindowBeingDragged(FloatingWindow *fw);
 #endif
diff --git a/src/private/multisplitter/CMakeLists.txt b/src/private/multisplitter/CMakeLists.txt
index 27f676aa..78fea896 100644
--- a/src/private/multisplitter/CMakeLists.txt
+++ b/src/private/multisplitter/CMakeLists.txt
@@ -94,7 +94,7 @@ endif()
 target_include_directories(kddockwidgets_multisplitter
   PUBLIC
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-    $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../..>
   PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}
 )
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 29e079b4..78e6cb24 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -17,7 +17,7 @@ if(POLICY CMP0043)
   cmake_policy(SET CMP0043 NEW)
 endif()
 
-include_directories(${CMAKE_SOURCE_DIR}/src)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../src)
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 set(TESTING_SRCS utils.cpp Testing.cpp)