Merge branch 'v0.10.0' into dev-v0.10

Author: Maxxen

CMakeLists.txt

@@ -39,39 +39,41 @@ add_library(${EXTENSION_NAME} STATIC ${EXTENSION_SOURCES})
 # link to their own dependencies if they are building locally. If they have a
 # local (compatible) GDAL installation, we should use that instead of building
 # our own. (unless a static build is requested)
-execute_process(
-  # Generate project
-  COMMAND
-    ${CMAKE_COMMAND} -G ${CMAKE_GENERATOR}
-    -DDUCKDB_ENABLE_DEPRECATED_API=1
-    -DWASM_LOADABLE_EXTENSIONS=1
-    -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-    -DOSX_BUILD_ARCH=${OSX_BUILD_ARCH}
-    -DSPATIAL_USE_NETWORK=${SPATIAL_USE_NETWORK} 
-    -DOPENSSL_ROOT_DIR=$ENV{OPENSSL_ROOT_DIR}
-    -DVCPKG_MANIFEST_DIR='${VCPKG_MANIFEST_DIR}'
-    -DVCPKG_INSTALLED_DIR='${CMAKE_BINARY_DIR}/vcpkg_installed'
-    -DCMAKE_TOOLCHAIN_FILE='${CMAKE_TOOLCHAIN_FILE}'
-    -DVCPKG_TARGET_TRIPLET='${VCPKG_TARGET_TRIPLET}'
-    -S ${CMAKE_CURRENT_SOURCE_DIR}/deps -B ${CMAKE_BINARY_DIR}/deps
-  RESULT_VARIABLE DEPENDENCIES_GENERATE_RESULT)
-if(NOT DEPENDENCIES_GENERATE_RESULT EQUAL 0)
-  message(FATAL_ERROR "Could not generate dependencies project")
-endif()
-execute_process(
-  # Build project
-  COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR}/deps --config
-          ${CMAKE_BUILD_TYPE} RESULT_VARIABLE DEPENDENCIES_BUILD_RESULT)
-if(NOT DEPENDENCIES_BUILD_RESULT EQUAL 0)
-  message(FATAL_ERROR "Could not build dependencies project")
+
+if(NOT EXISTS ${CMAKE_BINARY_DIR}/deps)
+  execute_process(
+    # Generate project
+    COMMAND
+      ${CMAKE_COMMAND} -G ${CMAKE_GENERATOR}
+      -DDUCKDB_ENABLE_DEPRECATED_API=1
+      -DWASM_LOADABLE_EXTENSIONS=1
+      -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+      -DOSX_BUILD_ARCH=${OSX_BUILD_ARCH}
+      -DSPATIAL_USE_NETWORK=${SPATIAL_USE_NETWORK}
+      -DOPENSSL_ROOT_DIR=$ENV{OPENSSL_ROOT_DIR}
+      -DVCPKG_MANIFEST_DIR='${VCPKG_MANIFEST_DIR}'
+      -DVCPKG_INSTALLED_DIR='${CMAKE_BINARY_DIR}/vcpkg_installed'
+      -DCMAKE_TOOLCHAIN_FILE='${CMAKE_TOOLCHAIN_FILE}'
+      -DVCPKG_TARGET_TRIPLET='${VCPKG_TARGET_TRIPLET}'
+      -S ${CMAKE_CURRENT_SOURCE_DIR}/deps -B ${CMAKE_BINARY_DIR}/deps
+    RESULT_VARIABLE DEPENDENCIES_GENERATE_RESULT)
+  if(NOT DEPENDENCIES_GENERATE_RESULT EQUAL 0)
+    message(FATAL_ERROR "Could not generate dependencies project")
+  endif()
+
+  execute_process(
+    # Build project
+    COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR}/deps --config
+            ${CMAKE_BUILD_TYPE} RESULT_VARIABLE DEPENDENCIES_BUILD_RESULT)
+  if(NOT DEPENDENCIES_BUILD_RESULT EQUAL 0)
+    message(FATAL_ERROR "Could not build dependencies project")
+  endif()
 endif()
 
-# Add dependencies
-set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH}
-                      ${CMAKE_BINARY_DIR}/deps/local)
-set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES} MD.lib
-)# annoyingly for expat on windows
+# annoyingly for expat on windows
+set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES} MD.lib)
 
+# Add dependencies
 list(APPEND CMAKE_FIND_ROOT_PATH "${CMAKE_BINARY_DIR}/deps/local/")
 list(APPEND CMAKE_PREFIX_PATH "${CMAKE_BINARY_DIR}/deps/local/")