Blame 0001-explictly-mark-opentld-libs-static.patch
|
Rex Dieter |
67123a1 |
From dd718f4948c106e67c15c9562832f8389ef3c338 Mon Sep 17 00:00:00 2001
|
|
Rex Dieter |
67123a1 |
From: Rex Dieter <rdieter@math.unl.edu>
|
|
Rex Dieter |
67123a1 |
Date: Wed, 5 Jun 2013 08:58:53 -0500
|
|
Rex Dieter |
67123a1 |
Subject: [PATCH] explictly mark opentld libs static
|
|
Rex Dieter |
67123a1 |
|
|
Rex Dieter |
67123a1 |
BUG: 320714
|
|
Rex Dieter |
67123a1 |
---
|
|
Rex Dieter |
67123a1 |
OpenTLD/src/3rdparty/cvblobs/CMakeLists.txt | 3 ++-
|
|
Rex Dieter |
67123a1 |
OpenTLD/src/libopentld/CMakeLists.txt | 3 ++-
|
|
Rex Dieter |
67123a1 |
2 files changed, 4 insertions(+), 2 deletions(-)
|
|
Rex Dieter |
67123a1 |
|
|
Rex Dieter |
67123a1 |
diff --git a/OpenTLD/src/3rdparty/cvblobs/CMakeLists.txt b/OpenTLD/src/3rdparty/cvblobs/CMakeLists.txt
|
|
Rex Dieter |
67123a1 |
index 2ff52ac..5a1e025 100644
|
|
Rex Dieter |
67123a1 |
--- a/OpenTLD/src/3rdparty/cvblobs/CMakeLists.txt
|
|
Rex Dieter |
67123a1 |
+++ b/OpenTLD/src/3rdparty/cvblobs/CMakeLists.txt
|
|
Rex Dieter |
67123a1 |
@@ -1,6 +1,7 @@
|
|
Rex Dieter |
67123a1 |
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../../libkface)
|
|
Rex Dieter |
67123a1 |
|
|
Rex Dieter |
67123a1 |
-ADD_LIBRARY(cvblobs blob.cpp
|
|
Rex Dieter |
67123a1 |
+ADD_LIBRARY(cvblobs STATIC
|
|
Rex Dieter |
67123a1 |
+ blob.cpp
|
|
Rex Dieter |
67123a1 |
BlobContour.cpp
|
|
Rex Dieter |
67123a1 |
BlobOperators.cpp
|
|
Rex Dieter |
67123a1 |
BlobProperties.cpp
|
|
Rex Dieter |
67123a1 |
diff --git a/OpenTLD/src/libopentld/CMakeLists.txt b/OpenTLD/src/libopentld/CMakeLists.txt
|
|
Rex Dieter |
67123a1 |
index b4bee3e..1e31d81 100644
|
|
Rex Dieter |
67123a1 |
--- a/OpenTLD/src/libopentld/CMakeLists.txt
|
|
Rex Dieter |
67123a1 |
+++ b/OpenTLD/src/libopentld/CMakeLists.txt
|
|
Rex Dieter |
67123a1 |
@@ -4,7 +4,8 @@ INCLUDE_DIRECTORIES(tld
|
|
Rex Dieter |
67123a1 |
)
|
|
Rex Dieter |
67123a1 |
|
|
Rex Dieter |
67123a1 |
|
|
Rex Dieter |
67123a1 |
-ADD_LIBRARY(opentld tld/Clustering.cpp
|
|
Rex Dieter |
67123a1 |
+ADD_LIBRARY(opentld STATIC
|
|
Rex Dieter |
67123a1 |
+ tld/Clustering.cpp
|
|
Rex Dieter |
67123a1 |
tld/DetectionResult.cpp
|
|
Rex Dieter |
67123a1 |
tld/DetectorCascade.cpp
|
|
Rex Dieter |
67123a1 |
tld/EnsembleClassifier.cpp
|
|
Rex Dieter |
67123a1 |
--
|
|
Rex Dieter |
67123a1 |
1.8.2.1
|
|
Rex Dieter |
67123a1 |
|