summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@edwardthomson.com>2014-10-27 06:33:11 -0700
committerEdward Thomson <ethomson@edwardthomson.com>2014-10-27 06:33:11 -0700
commit116a19d4674237af7a8ff1e1822e3033e1f8f0d7 (patch)
tree0a888b7145c3149331bcec7af7e89034ea159f95
parent177a29d8321ac2574973c2d63d77754abc85ede8 (diff)
parent79b0ae4e2460b79055c12658d306d93be721cc36 (diff)
downloadlibgit2-116a19d4674237af7a8ff1e1822e3033e1f8f0d7.tar.gz
Merge pull request #2666 from libgit2/cmn/threadsafe-on
Flip THREADSAFE's default to ON
-rw-r--r--CHANGELOG.md3
-rw-r--r--CMakeLists.txt2
-rw-r--r--README.md2
3 files changed, 5 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 93b189c05..9ccd2c485 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -104,3 +104,6 @@ v0.21 + 1
* Introduce git_note_author() and git_note_committer() to get the author
and committer information on a git_note, respectively.
+
+* The THREADSAFE option to build libgit2 with threading support has
+ been flipped to be on by default.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 22b6561c6..89dce4588 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,7 +24,7 @@ INCLUDE(AddCFlagIfSupported)
#
OPTION( SONAME "Set the (SO)VERSION of the target" ON )
OPTION( BUILD_SHARED_LIBS "Build Shared Library (OFF for Static)" ON )
-OPTION( THREADSAFE "Build libgit2 as threadsafe" OFF )
+OPTION( THREADSAFE "Build libgit2 as threadsafe" ON )
OPTION( BUILD_CLAR "Build Tests using the Clar suite" ON )
OPTION( BUILD_EXAMPLES "Build library usage example apps" OFF )
OPTION( TAGS "Generate tags" OFF )
diff --git a/README.md b/README.md
index b315eed1a..98aaa1dd7 100644
--- a/README.md
+++ b/README.md
@@ -90,7 +90,7 @@ The following CMake variables are declared:
- `INCLUDE_INSTALL_DIR`: Where to install headers to.
- `BUILD_SHARED_LIBS`: Build libgit2 as a Shared Library (defaults to ON)
- `BUILD_CLAR`: Build [Clar](https://github.com/vmg/clar)-based test suite (defaults to ON)
-- `THREADSAFE`: Build libgit2 with threading support (defaults to OFF)
+- `THREADSAFE`: Build libgit2 with threading support (defaults to ON)
- `STDCALL`: Build libgit2 as `stdcall`. Turn off for `cdecl` (Windows; defaults to ON)
Compiler and linker options