Skip to content

Commit

Permalink
Keep windows static
Browse files Browse the repository at this point in the history
  • Loading branch information
xhochy committed Jan 23, 2022
1 parent eab6dcd commit 440ce9c
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
2 changes: 1 addition & 1 deletion recipe/bld.bat
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ set SRC_DIR="%SRC_DIR:\=/%"
cmake -G "Ninja" ^
-DBUILD_TESTING=OFF ^
-DGOOGLE_CLOUD_CPP_ENABLE_EXAMPLES=OFF ^
-DBUILD_SHARED_LIBS=ON ^
-DBUILD_SHARED_LIBS=OFF ^
-DCMAKE_BUILD_TYPE=Release ^
-DCMAKE_INSTALL_PREFIX="%LIBRARY_PREFIX%" ^
-DCMAKE_MODULE_PATH="%LIBRARY_PREFIX%/lib/cmake" ^
Expand Down
5 changes: 3 additions & 2 deletions recipe/build-libgoogle-cloud.bat
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@ set BUILD_PREFIX="%BUILD_PREFIX:\=/%"
set SRC_DIR="%SRC_DIR:\=/%"

if [%PKG_NAME%] == [libgoogle-cloud] (
cmake --install build_cmake --component google_cloud_cpp_runtime
@rem cmake --install build_cmake --component google_cloud_cpp_runtime
if NOT ERRORLEVEL 0 exit /b 1
) else (
cmake --install build_cmake --component google_cloud_cpp_development
@rem cmake --install build_cmake --component google_cloud_cpp_development
cmake --install build_cmake
if NOT ERRORLEVEL 0 exit /b 1
)
7 changes: 4 additions & 3 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,12 @@ outputs:
- test -f $PREFIX/lib/libgoogle_cloud_cpp_bigtable.so.{{ version }} # [linux]
- test ! -f $PREFIX/lib/cmake/google_cloud_cpp_bigtable/google_cloud_cpp_bigtable-config.cmake # [not win]
- test ! -f $PREFIX/include/google/cloud/bigtable/version.h # [not win]
- if not exist %LIBRARY_PREFIX%\\bin\\libgoogle_cloud_cpp_storage.dll exit 1 # [win]
- if not exist %LIBRARY_PREFIX%\\lib\\pkgconfig\\google_cloud_cpp_storage.pc exit 1 # [win]
# Currently, the windows build is static.
#- if not exist %LIBRARY_PREFIX%\\bin\\libgoogle_cloud_cpp_storage.dll exit 1 # [win]
#- if not exist %LIBRARY_PREFIX%\\lib\\pkgconfig\\google_cloud_cpp_storage.pc exit 1 # [win]
- if exist %LIBRARY_PREFIX%\\lib\\cmake\\google_cloud_cpp_storage\\google_cloud_cpp_storage-config.cmake exit 1 # [win]
- if exist %LIBRARY_PREFIX%\\include\\google\\cloud\\storage\\version.h exit 1 # [win]
- if not exist %LIBRARY_PREFIX%\\bin\\libgoogle_cloud_cpp_bigtable.dll exit 1 # [win]
#- if not exist %LIBRARY_PREFIX%\\bin\\libgoogle_cloud_cpp_bigtable.dll exit 1 # [win]
- if exist %LIBRARY_PREFIX%\\lib\\cmake\\google_cloud_cpp_bigtable\\google_cloud_cpp_bigtable-config.cmake exit 1 # [win]
- if exist %LIBRARY_PREFIX%\\include\\google\\cloud\\bigtable\\version.h exit 1 # [win]
- name: google-cloud-cpp
Expand Down

0 comments on commit 440ce9c

Please sign in to comment.