Mercurial > hg > orthanc
changeset 5925:9704181280c6 find-refactoring
static linking against SQLite on macOS: reverted changeset 3a5b8ed2d859
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 16 Dec 2024 14:31:04 +0100 |
parents | 79cd099a2e8d |
children | 4692e1ae6d3d |
files | OrthancFramework/Resources/CMake/SQLiteConfiguration.cmake |
diffstat | 1 files changed, 1 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- 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 @@ # <http://www.gnu.org/licenses/>. -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)