Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(49)

Unified Diff: cmake/cmake_build

Issue 2009503002: CMake: control static/shared the normal CMake way. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: both, lpthread Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« cmake/CMakeLists.txt ('K') | « cmake/CMakeLists.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cmake/cmake_build
diff --git a/cmake/cmake_build b/cmake/cmake_build
index f2cb9bf1bf33a43618331337fc362462ab941d39..956f1a44b5b12c6520923cb02bc47e2e5e0d0394 100755
--- a/cmake/cmake_build
+++ b/cmake/cmake_build
@@ -25,9 +25,18 @@ pushd $here/../third_party/externals/cmake
make -j $cores cmake
popd
-echo "Building with bootstrapped CMake"
+echo "Building static library with bootstrapped CMake"
mkdir -p $SKIA_OUT/$BUILDTYPE
pushd $SKIA_OUT/$BUILDTYPE
-$here/../third_party/externals/cmake/bin/cmake -DCMAKE_BUILD_TYPE=$BUILDTYPE $here -G Ninja
+$here/../third_party/externals/cmake/bin/cmake -DCMAKE_BUILD_TYPE=$BUILDTYPE \
+ $here -G Ninja
+ninja
+popd
+
+echo "Building shared library with bootstrapped CMake"
+mkdir -p $SKIA_OUT/$BUILDTYPE
+pushd $SKIA_OUT/$BUILDTYPE
+$here/../third_party/externals/cmake/bin/cmake -DCMAKE_BUILD_TYPE=$BUILDTYPE -DBUILD_SHARED_LIBS=1 \
+ $here -G Ninja
ninja
popd
« cmake/CMakeLists.txt ('K') | « cmake/CMakeLists.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698