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
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
|
From: Anton Gladky <gladk@debian.org>
Date: Thu, 5 Nov 2020 17:37:59 +0100
Subject: Use packaged version of third_party libs.
Last-Update: 2017-06-24
---
src/CMakeLists.txt | 5 -----
src/test/CMakeLists.txt | 6 +++---
2 files changed, 3 insertions(+), 8 deletions(-)
Index: svgpp-1.3.1/src/CMakeLists.txt
===================================================================
--- svgpp-1.3.1.orig/src/CMakeLists.txt
+++ svgpp-1.3.1/src/CMakeLists.txt
@@ -4,10 +4,6 @@ project(svgpp)
find_package(Boost REQUIRED)
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-
include_directories(
${Boost_INCLUDE_DIRS}
)
@@ -22,6 +18,5 @@ if (MSVC)
)
endif()
-add_subdirectory(demo/render)
add_subdirectory(samples)
add_subdirectory(test)
Index: svgpp-1.3.1/src/test/CMakeLists.txt
===================================================================
--- svgpp-1.3.1.orig/src/test/CMakeLists.txt
+++ svgpp-1.3.1/src/test/CMakeLists.txt
@@ -2,16 +2,16 @@ cmake_minimum_required (VERSION 2.8)
project(svgpp_test)
-set(GTEST_DIR ../../third_party/googletest/googletest)
-set(GMOCK_DIR ../../third_party/googletest/googlemock)
+set(GTEST_DIR /usr/src/googletest/googletest)
+set(GMOCK_DIR /usr/src/googletest/googlemock)
include_directories(
../../include
- ../../third_party
${GTEST_DIR}
${GTEST_DIR}/include
${GMOCK_DIR}
${GMOCK_DIR}/include
+ ../../third_party
)
if (MSVC)
|
