r485 | r2d | 2014-10-05 19:31:05 +0100 (Sun, 05 Oct 2014) | 4 lines
Changed paths:
   M /libmpc/trunk/CMakeLists.txt

If BUILD_SHARED_LIBS is set and SHARED undefined, then drive SHARED with
the BUILD_SHARED_LIBS value.
patch by Samuel Martin <s.martin49@gmail.com>

------------------------------------------------------------------------
Index: CMakeLists.txt
===================================================================
diff --git a/CMakeLists.txt b/libmpc/CMakeLists.txt
--- a/CMakeLists.txt	(revision 484)
+++ b/CMakeLists.txt	(revision 485)
@@ -7,11 +7,16 @@
 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)