diff --git a/SuperBuild/CMakeLists.txt b/SuperBuild/CMakeLists.txt index 9793cddb..d693a6c9 100644 --- a/SuperBuild/CMakeLists.txt +++ b/SuperBuild/CMakeLists.txt @@ -26,11 +26,21 @@ if (APPLE) # Use homebrew's clang compiler since Apple # does not allow us to link to libomp set(CXX_PATH ${HOMEBREW_INSTALL_PREFIX}/bin/c++-12) + set(APPLE_CMAKE_ARGS "") + message("Checking for ${CXX_PATH}...") if(EXISTS "${CXX_PATH}") - message("Found Homebrew's compiler: ${CXX_PATH}") + message("Found Homebrew's C++ compiler: ${CXX_PATH}") set(CMAKE_CXX_COMPILER ${CXX_PATH}) - set(APPLE_CMAKE_ARGS "-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}") + list(APPEND APPLE_CMAKE_ARGS "-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}") + endif() + + set(C_PATH ${HOMEBREW_INSTALL_PREFIX}/bin/gcc-12) + message("Checking for ${C_PATH}...") + if(EXISTS "${C_PATH}") + message("Found Homebrew's C compiler: ${C_PATH}") + set(CMAKE_C_COMPILER ${C_PATH}) + list(APPEND APPLE_CMAKE_ARGS "-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}") endif() if (NOT APPLE_CMAKE_ARGS) diff --git a/SuperBuild/cmake/External-OpenSfM.cmake b/SuperBuild/cmake/External-OpenSfM.cmake index ce50041d..2e18f6d5 100644 --- a/SuperBuild/cmake/External-OpenSfM.cmake +++ b/SuperBuild/cmake/External-OpenSfM.cmake @@ -25,7 +25,7 @@ ExternalProject_Add(${_proj_name} #--Download step-------------- DOWNLOAD_DIR ${SB_DOWNLOAD_DIR} GIT_REPOSITORY https://github.com/OpenDroneMap/OpenSfM/ - GIT_TAG 304 + GIT_TAG 305 #--Update/Patch step---------- UPDATE_COMMAND git submodule update --init --recursive #--Configure step------------- diff --git a/VERSION b/VERSION index b0f2dcb3..eca690e7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.0.4 +3.0.5 diff --git a/docs/issue_template.md b/docs/issue_template.md index 07c7ee94..f873a132 100644 --- a/docs/issue_template.md +++ b/docs/issue_template.md @@ -20,7 +20,7 @@ Please use the format below to report bugs and faults. [Type answer here] -### How can we reproduce this? What steps did you do to trigger the problem? If this is an issue with processing a dataset, YOU MUST include a copy of your dataset uploaded on Google Drive or Dropbox (otherwise we cannot reproduce this). +### How can we reproduce this? What steps did you do to trigger the problem? If this is an issue with processing a dataset, YOU MUST include a copy of your dataset AND task output log, uploaded on Google Drive or Dropbox (otherwise we cannot reproduce this). [Type answer here]