1*4882a593SmuzhiyunFrom d2f01ba6fa2a065156fad686d1849309c661e527 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Samuel Martin <s.martin49@gmail.com> 3*4882a593SmuzhiyunDate: Sun, 31 Aug 2014 12:07:31 +0200 4*4882a593SmuzhiyunSubject: [PATCH 2/2] cmake: use the standard CMake flag to drive the shared 5*4882a593Smuzhiyun object build 6*4882a593Smuzhiyun 7*4882a593SmuzhiyunIf BUILD_SHARED_LIBS is set and SHARED undefined, then drive SHARED with 8*4882a593Smuzhiyunthe BUILD_SHARED_LIBS value. 9*4882a593Smuzhiyun 10*4882a593SmuzhiyunSigned-off-by: Samuel Martin <s.martin49@gmail.com> 11*4882a593Smuzhiyun--- 12*4882a593Smuzhiyun CMakeLists.txt | 15 ++++++++++----- 13*4882a593Smuzhiyun 1 file changed, 10 insertions(+), 5 deletions(-) 14*4882a593Smuzhiyun 15*4882a593Smuzhiyundiff --git a/CMakeLists.txt b/CMakeLists.txt 16*4882a593Smuzhiyunindex b13f78c..db75510 100755 17*4882a593Smuzhiyun--- a/CMakeLists.txt 18*4882a593Smuzhiyun+++ b/CMakeLists.txt 19*4882a593Smuzhiyun@@ -7,11 +7,16 @@ project(libmpc C) 20*4882a593Smuzhiyun set(CMAKE_VERBOSE_MAKEFILE false) 21*4882a593Smuzhiyun TEST_BIG_ENDIAN(MPC_ENDIANNESS) 22*4882a593Smuzhiyun 23*4882a593Smuzhiyun-if(WIN32) 24*4882a593Smuzhiyun- option(SHARED "Use shared libmpcdec" OFF) 25*4882a593Smuzhiyun-else(WIN32) 26*4882a593Smuzhiyun- option(SHARED "Use shared libmpcdec" ON) 27*4882a593Smuzhiyun-endif(WIN32) 28*4882a593Smuzhiyun+# Use the standard CMake flag to drive the shared object build. 29*4882a593Smuzhiyun+if(DEFINED BUILD_SHARED_LIBS AND NOT DEFINED SHARED) 30*4882a593Smuzhiyun+ set(SHARED ${BUILD_SHARED_LIBS}) 31*4882a593Smuzhiyun+else() 32*4882a593Smuzhiyun+ if(WIN32) 33*4882a593Smuzhiyun+ option(SHARED "Use shared libmpcdec" OFF) 34*4882a593Smuzhiyun+ else(WIN32) 35*4882a593Smuzhiyun+ option(SHARED "Use shared libmpcdec" ON) 36*4882a593Smuzhiyun+ endif(WIN32) 37*4882a593Smuzhiyun+endif() 38*4882a593Smuzhiyun 39*4882a593Smuzhiyun add_definitions(-DFAST_MATH -DCVD_FASTLOG) 40*4882a593Smuzhiyun 41*4882a593Smuzhiyun-- 42*4882a593Smuzhiyun2.1.0 43*4882a593Smuzhiyun 44