blob: 4bfeca0a04d33ae28346b08ded10b129228079db (
plain)
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
|
From d2f01ba6fa2a065156fad686d1849309c661e527 Mon Sep 17 00:00:00 2001
From: Samuel Martin <s.martin49@gmail.com>
Date: Sun, 31 Aug 2014 12:07:31 +0200
Subject: [PATCH 2/2] cmake: use the standard CMake flag to drive the shared
object build
If BUILD_SHARED_LIBS is set and SHARED undefined, then drive SHARED with
the BUILD_SHARED_LIBS value.
Signed-off-by: Samuel Martin <s.martin49@gmail.com>
---
CMakeLists.txt | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b13f78c..db75510 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,11 +7,16 @@ project(libmpc C)
set(CMAKE_VERBOSE_MAKEFILE false)
TEST_BIG_ENDIAN(MPC_ENDIANNESS)
-if(WIN32)
- option(SHARED "Use shared libmpcdec" OFF)
-else(WIN32)
- option(SHARED "Use shared libmpcdec" ON)
-endif(WIN32)
+# Use the standard CMake flag to drive the shared object build.
+if(DEFINED BUILD_SHARED_LIBS AND NOT DEFINED SHARED)
+ set(SHARED ${BUILD_SHARED_LIBS})
+else()
+ if(WIN32)
+ option(SHARED "Use shared libmpcdec" OFF)
+ else(WIN32)
+ option(SHARED "Use shared libmpcdec" ON)
+ endif(WIN32)
+endif()
add_definitions(-DFAST_MATH -DCVD_FASTLOG)
--
2.1.0
|
