diff --git a/cmake/FetchDependency.cmake b/cmake/FetchDependency.cmake index 78592b91..249d8da1 100644 --- a/cmake/FetchDependency.cmake +++ b/cmake/FetchDependency.cmake @@ -3,7 +3,7 @@ if(NOT WIN32) find_package(Git QUIET) find_package(Subversion QUIET) # no FetchContent until 3.11 - if((${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.11.0") AND (Git_FOUND OR Subversion_FOUND)) + if((NOT ${CMAKE_VERSION} VERSION_LESS "3.11.0") AND (Git_FOUND OR Subversion_FOUND)) include(FetchContent) set(FetchContent_INCLUDED TRUE) endif() @@ -45,7 +45,7 @@ function(FetchDependency name) else() message(FATAL_ERROR "The provided path to ${ARGS_DIR} does not exist (Use ${name}_PATH)") endif() - elseif(FetchContent_INCLUDED AND ((Subversion_FOUND AND ARGS_SVN_REPOSITORY) OR (Git_FOUND AND ARGS_GIT_REPOSITORY) OR (${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.18.0" AND ARGS_FILE_DOWNLOAD))) + elseif(FetchContent_INCLUDED AND ((Subversion_FOUND AND ARGS_SVN_REPOSITORY) OR (Git_FOUND AND ARGS_GIT_REPOSITORY) OR ((NOT ${CMAKE_VERSION} VERSION_LESS "3.18.0") AND ARGS_FILE_DOWNLOAD))) set(${name}_PATH ${VGM_SOURCE_DIR}/dependencies/${ARGS_DIR}) set(${name}_PATH ${${name}_PATH} PARENT_SCOPE) set(${name}_SOURCE "(download)" PARENT_SCOPE) @@ -87,7 +87,7 @@ function(FetchDependency name) endif() break() - elseif(CURRENT_FETCH STREQUAL "file" AND ${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.18.0" AND ARGS_FILE_DOWNLOAD) + elseif(CURRENT_FETCH STREQUAL "file" AND (NOT ${CMAKE_VERSION} VERSION_LESS "3.18.0") AND ARGS_FILE_DOWNLOAD) # no ARCHIVE_EXTRACT until 3.18 string(REGEX REPLACE ".*/" "" FILE ${ARGS_FILE_DOWNLOAD}) if(NOT EXISTS ${${name}_PATH}/${FILE})