diff --git a/CMake/Dependencies.cmake b/CMake/Dependencies.cmake index 134040209..3d389d949 100644 --- a/CMake/Dependencies.cmake +++ b/CMake/Dependencies.cmake @@ -168,7 +168,7 @@ if(WIN32 AND NOT UWP_LIB) endif() if(NOT DEFINED DEVILUTIONX_SYSTEM_SIMPLEINI) - find_package(simpleini QUIET) + find_package(simpleini 4.19 QUIET) if(simpleini_FOUND) message("-- Found simpleini") else() @@ -178,9 +178,7 @@ if(NOT DEFINED DEVILUTIONX_SYSTEM_SIMPLEINI) endif() dependency_options("simpleini" DEVILUTIONX_SYSTEM_SIMPLEINI ON DEVILUTIONX_STATIC_SIMPLEINI) if(DEVILUTIONX_SYSTEM_SIMPLEINI) - if(NOT simpleini_FOUND) - find_package(simpleini REQUIRED) - endif() + find_package(simpleini 4.19 REQUIRED) else() add_subdirectory(3rdParty/simpleini) endif() diff --git a/CMake/finders/Findsimpleini.cmake b/CMake/finders/Findsimpleini.cmake index 8cf026f25..aed8bdb16 100644 --- a/CMake/finders/Findsimpleini.cmake +++ b/CMake/finders/Findsimpleini.cmake @@ -7,9 +7,18 @@ find_path(simpleini_INCLUDE_DIR SimpleIni.h find_library(simpleini_LIBRARY simpleini HINTS ${PC_simpleini_LIBDIR} ${PC_simpleini_LIBRARY_DIRS}) + +if (NOT simpleini_INCLUDE_DIR STREQUAL "simpleini_INCLUDE_DIR-NOTFOUND") + file(READ "${simpleini_INCLUDE_DIR}/SimpleIni.h" _version_header_content) + if(_version_header_content MATCHES "