Skip to content

Commit 9d0926c

Browse files
devjgmdevjgm
committed
remove default from NCPU in non-demo files
1 parent b5c75f1 commit 9d0926c

2 files changed

Lines changed: 15 additions & 15 deletions

File tree

‎ci/cloudbuild/dockerfiles/ubuntu-bionic-install.Dockerfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ RUN curl -sSL https://github.com/google/crc32c/archive/1.1.0.tar.gz | \
104104
-DCRC32C_BUILD_BENCHMARKS=OFF \
105105
-DCRC32C_USE_GLOG=OFF \
106106
-H. -Bcmake-out -GNinja && \
107-
cmake --build cmake-out --target install -- -j ${NCPU:-4} && \
107+
cmake --build cmake-out --target install -- -j ${NCPU} && \
108108
ldconfig && \
109109
cd /var/tmp && rm -fr build
110110

@@ -116,7 +116,7 @@ RUN curl -sSL https://github.com/nlohmann/json/archive/v3.9.1.tar.gz | \
116116
-DBUILD_SHARED_LIBS=yes \
117117
-DBUILD_TESTING=OFF \
118118
-H. -Bcmake-out -GNinja && \
119-
cmake --build cmake-out --target install -- -j ${NCPU:-4} && \
119+
cmake --build cmake-out --target install -- -j ${NCPU} && \
120120
ldconfig && \
121121
cd /var/tmp && rm -fr build
122122

@@ -128,7 +128,7 @@ RUN curl -sSL https://github.com/google/protobuf/archive/v3.15.8.tar.gz | \
128128
-DBUILD_SHARED_LIBS=yes \
129129
-Dprotobuf_BUILD_TESTS=OFF \
130130
-Hcmake -Bcmake-out -GNinja && \
131-
cmake --build cmake-out --target install -- -j ${NCPU:-4} && \
131+
cmake --build cmake-out --target install -- -j ${NCPU} && \
132132
ldconfig && \
133133
cd /var/tmp && rm -fr build
134134

@@ -139,7 +139,7 @@ RUN curl -sSL https://github.com/c-ares/c-ares/archive/refs/tags/cares-1_17_1.ta
139139
-DCMAKE_BUILD_TYPE=Release \
140140
-DBUILD_SHARED_LIBS=yes \
141141
-H. -Bcmake-out -GNinja && \
142-
cmake --build cmake-out --target install -- -j ${NCPU:-4} && \
142+
cmake --build cmake-out --target install -- -j ${NCPU} && \
143143
ldconfig && \
144144
cd /var/tmp && rm -fr build
145145

@@ -150,7 +150,7 @@ RUN curl -sSL https://github.com/google/re2/archive/2020-11-01.tar.gz | \
150150
-DBUILD_SHARED_LIBS=ON \
151151
-DRE2_BUILD_TESTING=OFF \
152152
-H. -Bcmake-out -GNinja && \
153-
cmake --build cmake-out --target install -- -j ${NCPU:-4} && \
153+
cmake --build cmake-out --target install -- -j ${NCPU} && \
154154
ldconfig && \
155155
cd /var/tmp && rm -fr build
156156

@@ -169,7 +169,7 @@ RUN curl -sSL https://github.com/grpc/grpc/archive/v1.35.0.tar.gz | \
169169
-DgRPC_SSL_PROVIDER=package \
170170
-DgRPC_ZLIB_PROVIDER=package \
171171
-H. -Bcmake-out -GNinja && \
172-
cmake --build cmake-out --target install -- -j ${NCPU:-4} && \
172+
cmake --build cmake-out --target install -- -j ${NCPU} && \
173173
ldconfig && \
174174
cd /var/tmp && rm -fr build
175175

‎ci/cloudbuild/dockerfiles/ubuntu-xenial.Dockerfile‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ RUN curl -sSL https://github.com/abseil/abseil-cpp/archive/20210324.2.tar.gz | \
6565
-DBUILD_SHARED_LIBS=yes \
6666
-DCMAKE_CXX_STANDARD=11 \
6767
-H. -Bcmake-out -GNinja && \
68-
cmake --build cmake-out --target install -- -j ${NCPU:-4} && \
68+
cmake --build cmake-out --target install -- -j ${NCPU} && \
6969
ldconfig && \
7070
cd /var/tmp && rm -fr build
7171

@@ -77,7 +77,7 @@ RUN curl -sSL https://github.com/google/googletest/archive/release-1.11.0.tar.gz
7777
-DBUILD_SHARED_LIBS=yes \
7878
-DCMAKE_CXX_STANDARD=11 \
7979
-H. -Bcmake-out/googletest && \
80-
cmake --build cmake-out/googletest --target install -- -j ${NCPU:-4} && \
80+
cmake --build cmake-out/googletest --target install -- -j ${NCPU} && \
8181
ldconfig && \
8282
cd /var/tmp && rm -fr build
8383

@@ -89,7 +89,7 @@ RUN curl -sSL https://github.com/google/benchmark/archive/v1.5.5.tar.gz | \
8989
-DBUILD_SHARED_LIBS=yes \
9090
-DBENCHMARK_ENABLE_TESTING=OFF \
9191
-H. -Bcmake-out -GNinja && \
92-
cmake --build cmake-out --target install -- -j ${NCPU:-4} && \
92+
cmake --build cmake-out --target install -- -j ${NCPU} && \
9393
ldconfig && \
9494
cd /var/tmp && rm -fr build
9595

@@ -103,7 +103,7 @@ RUN curl -sSL https://github.com/google/crc32c/archive/1.1.0.tar.gz | \
103103
-DCRC32C_BUILD_BENCHMARKS=OFF \
104104
-DCRC32C_USE_GLOG=OFF \
105105
-H. -Bcmake-out -GNinja && \
106-
cmake --build cmake-out --target install -- -j ${NCPU:-4} && \
106+
cmake --build cmake-out --target install -- -j ${NCPU} && \
107107
ldconfig && \
108108
cd /var/tmp && rm -fr build
109109

@@ -115,7 +115,7 @@ RUN curl -sSL https://github.com/nlohmann/json/archive/v3.9.1.tar.gz | \
115115
-DBUILD_SHARED_LIBS=yes \
116116
-DBUILD_TESTING=OFF \
117117
-H. -Bcmake-out -GNinja && \
118-
cmake --build cmake-out --target install -- -j ${NCPU:-4} && \
118+
cmake --build cmake-out --target install -- -j ${NCPU} && \
119119
ldconfig && \
120120
cd /var/tmp && rm -fr build
121121

@@ -127,7 +127,7 @@ RUN curl -sSL https://github.com/google/protobuf/archive/v3.15.8.tar.gz | \
127127
-DBUILD_SHARED_LIBS=yes \
128128
-Dprotobuf_BUILD_TESTS=OFF \
129129
-Hcmake -Bcmake-out -GNinja && \
130-
cmake --build cmake-out --target install -- -j ${NCPU:-4} && \
130+
cmake --build cmake-out --target install -- -j ${NCPU} && \
131131
ldconfig && \
132132
cd /var/tmp && rm -fr build
133133

@@ -138,7 +138,7 @@ RUN curl -sSL https://github.com/c-ares/c-ares/archive/refs/tags/cares-1_17_1.ta
138138
-DCMAKE_BUILD_TYPE=Release \
139139
-DBUILD_SHARED_LIBS=yes \
140140
-H. -Bcmake-out -GNinja && \
141-
cmake --build cmake-out --target install -- -j ${NCPU:-4} && \
141+
cmake --build cmake-out --target install -- -j ${NCPU} && \
142142
ldconfig && \
143143
cd /var/tmp && rm -fr build
144144

@@ -149,7 +149,7 @@ RUN curl -sSL https://github.com/google/re2/archive/2020-11-01.tar.gz | \
149149
-DBUILD_SHARED_LIBS=ON \
150150
-DRE2_BUILD_TESTING=OFF \
151151
-H. -Bcmake-out -GNinja && \
152-
cmake --build cmake-out --target install -- -j ${NCPU:-4} && \
152+
cmake --build cmake-out --target install -- -j ${NCPU} && \
153153
ldconfig && \
154154
cd /var/tmp && rm -fr build
155155

@@ -168,6 +168,6 @@ RUN curl -sSL https://github.com/grpc/grpc/archive/v1.35.0.tar.gz | \
168168
-DgRPC_SSL_PROVIDER=package \
169169
-DgRPC_ZLIB_PROVIDER=package \
170170
-H. -Bcmake-out -GNinja && \
171-
cmake --build cmake-out --target install -- -j ${NCPU:-4} && \
171+
cmake --build cmake-out --target install -- -j ${NCPU} && \
172172
ldconfig && \
173173
cd /var/tmp && rm -fr build

0 commit comments

Comments
 (0)