# HG changeset patch # User Sebastien Jodogne # Date 1734355864 -3600 # Node ID 9704181280c6742ced7f2fc26eb38c81bf6b8fb8 # Parent 79cd099a2e8df7d558ec63c735ab9302314d07ac static linking against SQLite on macOS: reverted changeset 3a5b8ed2d859 diff -r 79cd099a2e8d -r 9704181280c6 OrthancFramework/Resources/CMake/SQLiteConfiguration.cmake --- a/OrthancFramework/Resources/CMake/SQLiteConfiguration.cmake Mon Dec 16 12:43:57 2024 +0100 +++ b/OrthancFramework/Resources/CMake/SQLiteConfiguration.cmake Mon Dec 16 14:31:04 2024 +0100 @@ -20,16 +20,7 @@ # . -if (APPLE) - # Under OS X, the binaries must always be linked against the - # system-wide version of SQLite. Otherwise, if some Orthanc plugin - # also uses its own version of SQLite (such as orthanc-webviewer), - # this results in a crash in "sqlite3_mutex_enter(db->mutex);" (the - # mutex is not initialized), probably because the EXE and the DYNLIB - # share the same memory location for this mutex. - set(SQLITE_STATIC OFF) - -elseif (STATIC_BUILD OR NOT USE_SYSTEM_SQLITE) +if (STATIC_BUILD OR NOT USE_SYSTEM_SQLITE) set(SQLITE_STATIC ON) else() set(SQLITE_STATIC OFF)