Package: caveexpress / 2.4+git20160609-3

build.patch Patch series | download
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
From: Markus Koschany <apo@debian.org>
Date: Thu, 9 Jun 2016 09:43:12 +0200
Subject: build

We don't ship the third party libraries.
list(SORT RESULT) causes a build failure.
---
 CMakeLists.txt     | 6 ------
 cmake/macros.cmake | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8dfaea6..0366b6d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -169,12 +169,6 @@ include_directories(${CMAKE_BINARY_DIR})
 
 include_directories(src)
 include_directories(src/modules)
-if (UNITTESTS)
-	include_directories(src/libs/gtest)
-	include_directories(src/libs/gtest/include)
-endif()
-
-add_subdirectory(src/libs)
 
 # TODO move into lib cmakefiles
 if (LUA5.2_FOUND)
diff --git a/cmake/macros.cmake b/cmake/macros.cmake
index 1471e1f..12a3957 100644
--- a/cmake/macros.cmake
+++ b/cmake/macros.cmake
@@ -128,7 +128,7 @@ macro(create_dir_header PROJECTNAME)
 		file(APPEND ${TARGET_FILE} "if (basedir == \"${SUBDIR}/\") {\n")
 		file(APPEND ${TARGET_FILE} "\tentriesAll.reserve(${LISTENTRIES});\n")
 		set(RESULT ${FILESINDIR})
-		list(SORT RESULT)
+        #list(SORT RESULT)
 		foreach(FILEINDIR ${RESULT})
 			string(COMPARE EQUAL "${FILEINDIR}" ".gitignore" IGNOREFILE)
 			if (NOT IGNOREFILE)