removing leading and trailing '

hafenkran · Jul 4, 2024 · 9ab2827 · 9ab2827
1 parent 36498ac
commit 9ab2827
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,19 +5,20 @@ set(TARGET_NAME bigquery)
 # set(CMAKE_OSX_DEPLOYMENT_TARGET 14.0)
 
 # Compile and install google-cloud-cpp depedencies
+message("Installing google-cloud-cpp dependencies")
 execute_process(
     COMMAND
         ${CMAKE_COMMAND} -G ${CMAKE_GENERATOR}
         -DDUCKDB_ENABLE_DEPRECATED_API=1
         -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-        -DVCPKG_MANIFEST_DIR='${VCPKG_MANIFEST_DIR}'
-        -DVCPKG_INSTALLED_DIR='${CMAKE_BINARY_DIR}/vcpkg_installed'
-        # -DVCPKG_INSTALLED_DIR='${VCPKG_INSTALLED_DIR}'
-        -DCMAKE_TOOLCHAIN_FILE='${CMAKE_TOOLCHAIN_FILE}'
+        -DVCPKG_MANIFEST_DIR=${VCPKG_MANIFEST_DIR}
+        -DVCPKG_INSTALLED_DIR=${CMAKE_BINARY_DIR}/vcpkg_installed
+        # -DVCPKG_INSTALLED_DIR=${VCPKG_INSTALLED_DIR}
+        -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
         -DOSX_BUILD_ARCH=${OSX_BUILD_ARCH}
-        -DCMAKE_OSX_ARCHITECTURES='${DCMAKE_OSX_ARCHITECTURES}'
-        -DCMAKE_OSX_DEPLOYMENT_TARGET='${CMAKE_OSX_DEPLOYMENT_TARGET}'
-        -DVCPKG_TARGET_TRIPLET='${VCPKG_TARGET_TRIPLET}'
+        -DCMAKE_OSX_ARCHITECTURES=${DCMAKE_OSX_ARCHITECTURES}
+        -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}
+        -DVCPKG_TARGET_TRIPLET=${VCPKG_TARGET_TRIPLET}
         -S ${CMAKE_CURRENT_SOURCE_DIR}/external -B ${CMAKE_BINARY_DIR}/external
     RESULT_VARIABLE DEPENDENCIES_GENERATE_RESULT)
 

diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
@@ -27,10 +27,10 @@ ExternalProject_Add(
                -DBUILD_TESTING=OFF
                -DBUILD_SHARED_LIBS=OFF
                # vcpkg options
-               -DVCPKG_MANIFEST_DIR='${VCPKG_MANIFEST_DIR}'
-               -DVCPKG_INSTALLED_DIR='${VCPKG_INSTALLED_DIR}'
-               -DVCPKG_TARGET_TRIPLET='${VCPKG_TARGET_TRIPLET}'
-               -DCMAKE_TOOLCHAIN_FILE='${CMAKE_TOOLCHAIN_FILE}'
+               -DVCPKG_MANIFEST_DIR=${VCPKG_MANIFEST_DIR}
+               -DVCPKG_INSTALLED_DIR=${VCPKG_INSTALLED_DIR}
+               -DVCPKG_TARGET_TRIPLET=${VCPKG_TARGET_TRIPLET}
+               -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
                # Project Options
                -DGOOGLE_CLOUD_CPP_ENABLE_EXAMPLES=OFF
                -DGOOGLE_CLOUD_CPP_WITH_MOCKS=OFF
@@ -51,10 +51,10 @@ ExternalProject_Add(
                -DBUILD_TESTING=OFF
                -DBUILD_SHARED_LIBS=OFF
                # vcpkg options
-               -DVCPKG_MANIFEST_DIR='${VCPKG_MANIFEST_DIR}'
-               -DVCPKG_INSTALLED_DIR='${VCPKG_INSTALLED_DIR}'
-               -DCMAKE_TOOLCHAIN_FILE='${CMAKE_TOOLCHAIN_FILE}'
-               -DVCPKG_TARGET_TRIPLET='${VCPKG_TARGET_TRIPLET}'
+               -DVCPKG_MANIFEST_DIR=${VCPKG_MANIFEST_DIR}
+               -DVCPKG_INSTALLED_DIR=${VCPKG_INSTALLED_DIR}
+               -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
+               -DVCPKG_TARGET_TRIPLET=${VCPKG_TARGET_TRIPLET}
                # Project Options
                -DGOOGLE_CLOUD_CPP_ENABLE_EXAMPLES=OFF
                -DGOOGLE_CLOUD_CPP_WITH_MOCKS=OFF