diff --git a/recipe/bld.bat b/recipe/bld.bat index 8eb5ca0..8591db8 100644 --- a/recipe/bld.bat +++ b/recipe/bld.bat @@ -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" ^ diff --git a/recipe/build-libgoogle-cloud.bat b/recipe/build-libgoogle-cloud.bat index 1676039..fbbc16e 100644 --- a/recipe/build-libgoogle-cloud.bat +++ b/recipe/build-libgoogle-cloud.bat @@ -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 ) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 09d8e5a..465d893 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -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