From: Kefu Chai Date: Mon, 6 Jun 2016 04:42:02 +0000 (+0800) Subject: cmake: s/BUILD_SHARED_LIBS/ENABLE_SHARED/ X-Git-Tag: v11.0.0~299^2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=9e768393bf32ac77e3284c36d9b532231967b44e;p=ceph.git cmake: s/BUILD_SHARED_LIBS/ENABLE_SHARED/ Signed-off-by: Kefu Chai --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 9956aa80cb833..7af5d45386af4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -157,8 +157,6 @@ else(ENABLE_SHARED) set(CEPH_SHARED STATIC) endif(ENABLE_SHARED) -option(BUILD_SHARED_LIBS "Build shared libraries" ON) - find_package(execinfo) find_package(udev REQUIRED) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b62a479d8ea9f..55482e73bddf1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -461,10 +461,10 @@ else() perfglue/disabled_stubs.cc) endif(${HAVE_GPERFTOOLS}) -if(BUILD_SHARED_LIBS) +if(ENABLE_SHARED) list(APPEND libcommon_files $) -endif(BUILD_SHARED_LIBS) +endif(ENABLE_SHARED) add_library(common STATIC ${libcommon_files} $