Tony Theodore
6 years ago
parent
a25fa9fb46
commit
a9e909ff7c
@ -1,41 +0,0 @@
|
||||
This file is part of MXE. See LICENSE.md for licensing information.
|
||||
|
||||
This patch has been taken from:
|
||||
https://github.com/georgmartius/vid.stab/pull/19
|
||||
|
||||
From 1b6d48225e6c0c2c04598782582c9a0f1ea1d8e4 Mon Sep 17 00:00:00 2001
|
||||
From: Timothy Gu <timothygu99@gmail.com>
|
||||
Date: Fri, 8 Aug 2014 14:56:19 -0700
|
||||
Subject: [PATCH] Support changing lib type through BUILD_SHARED_LIBS
|
||||
|
||||
---
|
||||
CMakeLists.txt | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index f310e4d..e9a2af4 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -12,6 +12,9 @@ set(MINOR_VERSION 0)
|
||||
set(PATCH_VERSION 0)
|
||||
set(VIDSTAB_VERSION ${MAJOR_VERSION}.${MINOR_VERSION}${PATCH_VERSION})
|
||||
|
||||
+option(BUILD_SHARED_LIBS "build shared libraries instead of static libraries"
|
||||
+ ON)
|
||||
+
|
||||
add_definitions( -Wall -O3 -g -Wno-pointer-sign -fPIC -std=gnu99)
|
||||
# add_definitions( -Wall -O0 -g -Wno-pointer-sign )
|
||||
|
||||
@@ -43,8 +46,7 @@ set(HEADERS src/frameinfo.h src/transformtype.h src/libvidstab.h
|
||||
|
||||
|
||||
# Create the vidstab library
|
||||
-# add_library (vidstab STATIC ${SOURCES})
|
||||
-add_library (vidstab SHARED ${SOURCES})
|
||||
+add_library (vidstab ${SOURCES})
|
||||
|
||||
#set version of lib
|
||||
set_target_properties(vidstab PROPERTIES SOVERSION ${MAJOR_VERSION}.${MINOR_VERSION})
|
||||
--
|
||||
2.0.3
|
||||
|
||||
@ -1,64 +0,0 @@
|
||||
This file is part of MXE. See LICENSE.md for licensing information.
|
||||
|
||||
This patch has been taken from:
|
||||
https://github.com/georgmartius/vid.stab/pull/20
|
||||
|
||||
From f06ce5b7ad4fc60ecf11b86059541c7dc321806c Mon Sep 17 00:00:00 2001
|
||||
From: Timothy Gu <timothygu99@gmail.com>
|
||||
Date: Fri, 15 Aug 2014 17:58:49 -0700
|
||||
Subject: [PATCH] Fix if BUILD_SHARED_LIBS is OFF
|
||||
|
||||
The option() disrupts toolchain files.
|
||||
|
||||
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
|
||||
---
|
||||
CMakeLists.txt | 26 ++++++++++++--------------
|
||||
1 file changed, 12 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index e9a2af4..920a2da 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -12,9 +12,6 @@ set(MINOR_VERSION 0)
|
||||
set(PATCH_VERSION 0)
|
||||
set(VIDSTAB_VERSION ${MAJOR_VERSION}.${MINOR_VERSION}${PATCH_VERSION})
|
||||
|
||||
-option(BUILD_SHARED_LIBS "build shared libraries instead of static libraries"
|
||||
- ON)
|
||||
-
|
||||
add_definitions( -Wall -O3 -g -Wno-pointer-sign -fPIC -std=gnu99)
|
||||
# add_definitions( -Wall -O0 -g -Wno-pointer-sign )
|
||||
|
||||
@@ -48,17 +45,18 @@ set(HEADERS src/frameinfo.h src/transformtype.h src/libvidstab.h
|
||||
# Create the vidstab library
|
||||
add_library (vidstab ${SOURCES})
|
||||
|
||||
-#set version of lib
|
||||
-set_target_properties(vidstab PROPERTIES SOVERSION ${MAJOR_VERSION}.${MINOR_VERSION})
|
||||
-
|
||||
-
|
||||
-target_link_libraries(vidstab m)
|
||||
-if(ORC_FOUND)
|
||||
-target_link_libraries(vidstab ${ORC_LIBRARIES})
|
||||
-endif()
|
||||
-if(USE_OMP)
|
||||
-target_link_libraries(vidstab gomp)
|
||||
-endif()
|
||||
+if(BUILD_SHARED_LIBS)
|
||||
+ #set version of lib
|
||||
+ set_target_properties(vidstab PROPERTIES SOVERSION ${MAJOR_VERSION}.${MINOR_VERSION})
|
||||
+
|
||||
+ target_link_libraries(vidstab m)
|
||||
+ if(ORC_FOUND)
|
||||
+ target_link_libraries(vidstab ${ORC_LIBRARIES})
|
||||
+ endif()
|
||||
+ if(USE_OMP)
|
||||
+ target_link_libraries(vidstab gomp)
|
||||
+ endif()
|
||||
+endif(BUILD_SHARED_LIBS)
|
||||
|
||||
|
||||
#if(!NOHEADERS)
|
||||
--
|
||||
2.0.3
|
||||
|
||||
Loading…
Reference in new issue