Description: Use system whereami for running tests
Author: David Kalnischkies <donkult@debian.org>
Forwarded: not-needed

--- a/cpp/ycm/tests/CMakeLists.txt
+++ b/cpp/ycm/tests/CMakeLists.txt
@@ -65,12 +65,6 @@
 
 add_executable( ${PROJECT_NAME} ${SOURCES} )
 
-target_include_directories(
-  ${PROJECT_NAME}
-  SYSTEM
-  PRIVATE ${ycm_core_SOURCE_DIR}/../whereami
-  )
-
 if ( MSVC )
   # Build ycm_core_tests and dependencies targets in cmake ycm/tests folder
   foreach( OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES} )
@@ -83,6 +77,7 @@
 endif()
 
 target_link_libraries( ${PROJECT_NAME}
+                       PRIVATE whereami
                        PRIVATE ycm_core
                        PRIVATE gtest ${CMAKE_THREAD_LIBS_INIT}
                        PRIVATE gmock )
--- a/cpp/ycm/tests/TestUtils.cpp
+++ b/cpp/ycm/tests/TestUtils.cpp
@@ -17,7 +17,7 @@
 
 #include "TestUtils.h"
 
-#include <whereami.c>
+#include <whereami.h>
 
 namespace std {