Skip to content

Commit 33e43ec

Browse files
afrindmeta-codesync[bot]
authored andcommitted
Static lib handling for glog and gflags
Summary: X-link: facebook/folly#2587 Move BUILD_SHARED_LIBS=ON from the unconditional cmake.defines section to a shared_libs=on conditional section in the glog manifest, so that static builds don't force shared library generation. Reviewed By: bigfootjon Differential Revision: D93644456 fbshipit-source-id: b02394c8b370a1a6a730f99fbe6218fd4545e501
1 parent 2c38bdd commit 33e43ec

2 files changed

Lines changed: 12 additions & 2 deletions

File tree

build/fbcode_builder/manifests/gflags

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,16 @@ builder = cmake
1010
subdir = gflags-2.2.2
1111

1212
[cmake.defines]
13-
BUILD_SHARED_LIBS = ON
1413
BUILD_STATIC_LIBS = ON
1514
#BUILD_gflags_nothreads_LIB = OFF
1615
BUILD_gflags_LIB = ON
1716

17+
[cmake.defines.os=windows]
18+
BUILD_SHARED_LIBS = ON
19+
20+
[cmake.defines.shared_libs=on]
21+
BUILD_SHARED_LIBS = ON
22+
1823
[homebrew]
1924
gflags
2025

build/fbcode_builder/manifests/glog

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,15 @@ subdir = glog-0.5.0
1313
gflags
1414

1515
[cmake.defines]
16-
BUILD_SHARED_LIBS=ON
1716
BUILD_TESTING=NO
1817
WITH_PKGCONFIG=ON
1918

19+
[cmake.defines.os=windows]
20+
BUILD_SHARED_LIBS=ON
21+
22+
[cmake.defines.shared_libs=on]
23+
BUILD_SHARED_LIBS=ON
24+
2025
[cmake.defines.os=freebsd]
2126
HAVE_TR1_UNORDERED_MAP=OFF
2227
HAVE_TR1_UNORDERED_SET=OFF

0 commit comments

Comments
 (0)