Skip to content

Commit da7b340

Browse files
committed
issue doxygen#11833 Allow minimum required macOS version using MACOS_VERSION_MIN
Example: cmake -DMACOS_VERSION_MIN=15.0 /path/to/doxygen
1 parent 80e3f76 commit da7b340

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ endif()
7272

7373
set(clang "0" CACHE INTERNAL "used in settings.h")
7474

75+
if (NOT DEFINED MACOS_VERSION_MIN) # to allow overruling with -DMACOS_VERSION_MIN
7576
set(MACOS_VERSION_MIN 10.14)
7677
if(use_libclang)
7778
set(clang "1" CACHE INTERNAL "used in settings.h")
@@ -88,10 +89,11 @@ if(use_sys_sqlite3)
8889
find_package(SQLite3 REQUIRED)
8990
endif()
9091
if(build_search AND CMAKE_SYSTEM MATCHES "Darwin")
91-
set(MACOS_VERSION_MIN 10.15)
92+
set(MACOS_VERSION_MIN 10.15) # needs std::filesystem
9293
endif()
9394
if(build_wizard AND CMAKE_SYSTEM MATCHES "Darwin")
94-
set(MACOS_VERSION_MIN 11.0)
95+
set(MACOS_VERSION_MIN 11.0) # needs Qt
96+
endif()
9597
endif()
9698

9799
# use C++17 standard for compiling (unless very new Clang is present)

src/regex.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -657,12 +657,14 @@ bool Ex::Private::matchAt(size_t tokenPos,size_t tokenLen,std::string_view str,M
657657
{
658658
char c_tok = tok.asciiValue();
659659
if (index>=str.length() || str[index]!=c_tok) return false; // end of string, or non matching char
660-
index++,tokenPos++;
660+
index++;
661+
tokenPos++;
661662
}
662663
else if (tok.isCharClass())
663664
{
664665
if (index>=str.length() || !matchCharClass(tokenPos,str[index])) return false;
665-
index++,tokenPos+=tok.value()+1; // skip over character ranges + end token
666+
index++;
667+
tokenPos+=tok.value()+1; // skip over character ranges + end token
666668
}
667669
else
668670
{

0 commit comments

Comments
 (0)