philipp/KDDockWidgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes for being used as a subproject

Browse Source 
* Don't use CMAKE_SOURCE_DIR, always use CMAKE_CURRENT_SOURCE_DIR
* -Werror=undef found that #if was used instead of #ifdef
This commit is contained in:
David Faure
2020-11-23 21:16:40 +01:00
parent dc328ff7c4
commit 77016a619f
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/api/CMakeLists.txt
View File

@@ -31,7 +31,7 @@ add_custom_command(
OUTPUT ${DOXYGEN_OUTPUT_DIR}/qch/kddockwidgets-api.qch OUTPUT ${DOXYGEN_OUTPUT_DIR}/qch/kddockwidgets-api.qch
COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile 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 #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 DEPENDS ${_dox_deps} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
WORKING_DIRECTORY ${CMAKE_BINARY_DIR} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
) )

2
src/private/WindowBeingDragged.cpp
View File

@@ -81,7 +81,7 @@ WindowBeingDragged::WindowBeingDragged(Draggable *draggable)
} }
} }
#if DOCKS_DEVELOPER_MODE #ifdef DOCKS_DEVELOPER_MODE
// Just used by tests // Just used by tests
WindowBeingDragged::WindowBeingDragged(FloatingWindow *fw) WindowBeingDragged::WindowBeingDragged(FloatingWindow *fw)

2
src/private/WindowBeingDragged_p.h
View File

@@ -32,7 +32,7 @@ struct DOCKS_EXPORT_FOR_UNIT_TESTS WindowBeingDragged
public: public:
explicit WindowBeingDragged(FloatingWindow *fw, Draggable *draggable); explicit WindowBeingDragged(FloatingWindow *fw, Draggable *draggable);
#if DOCKS_DEVELOPER_MODE #ifdef DOCKS_DEVELOPER_MODE
// For tests. // For tests.
explicit WindowBeingDragged(FloatingWindow *fw); explicit WindowBeingDragged(FloatingWindow *fw);
#endif #endif

2
src/private/multisplitter/CMakeLists.txt
View File

@@ -94,7 +94,7 @@ endif()
target_include_directories(kddockwidgets_multisplitter target_include_directories(kddockwidgets_multisplitter
PUBLIC PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../..>
PRIVATE PRIVATE
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
) )

2
tests/CMakeLists.txt
View File

@@ -17,7 +17,7 @@ if(POLICY CMP0043)
cmake_policy(SET CMP0043 NEW) cmake_policy(SET CMP0043 NEW)
endif() endif()
include_directories(${CMAKE_SOURCE_DIR}/src) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../src)
include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR})
set(TESTING_SRCS utils.cpp Testing.cpp) set(TESTING_SRCS utils.cpp Testing.cpp)