1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
|
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
@@ -61,12 +61,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} )
@@ -79,6 +73,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 {
|
