zookeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h...@apache.org
Subject zookeeper git commit: ZOOKEEPER-2997: CMake should not force static CRT linking
Date Mon, 26 Mar 2018 02:19:26 GMT
Repository: zookeeper
Updated Branches:
  refs/heads/master 29a892907 -> 13c9f899f


ZOOKEEPER-2997: CMake should not force static CRT linking

By removing this code, CMake will use its own defaults for the CRT
flags (e.g., `/MDd` for debug configurations). With it removed, the
user can override this behavior by setting the `CMAKE_CXX_FLAGS`
manually when configuring ZooKeeper.

Author: Andrew Schwartzmeyer <andrew@schwartzmeyer.com>

Reviewers: Michael Han <hanm@apache.org>

Closes #485 from andschwa/ZOOKEEPER-2997


Project: http://git-wip-us.apache.org/repos/asf/zookeeper/repo
Commit: http://git-wip-us.apache.org/repos/asf/zookeeper/commit/13c9f899
Tree: http://git-wip-us.apache.org/repos/asf/zookeeper/tree/13c9f899
Diff: http://git-wip-us.apache.org/repos/asf/zookeeper/diff/13c9f899

Branch: refs/heads/master
Commit: 13c9f899ff62be6a2eacb28e522d06703f1dab08
Parents: 29a8929
Author: Andrew Schwartzmeyer <andrew@schwartzmeyer.com>
Authored: Sun Mar 25 19:19:01 2018 -0700
Committer: Michael Han <hanm@apache.org>
Committed: Sun Mar 25 19:19:01 2018 -0700

----------------------------------------------------------------------
 src/c/CMakeLists.txt | 5 -----
 1 file changed, 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zookeeper/blob/13c9f899/src/c/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/c/CMakeLists.txt b/src/c/CMakeLists.txt
index 05e5412..cb642a2 100644
--- a/src/c/CMakeLists.txt
+++ b/src/c/CMakeLists.txt
@@ -39,11 +39,6 @@ add_definitions(-DUSE_STATIC_LIB)
 option(WANT_SYNCAPI "Enables Sync API support" ON)
 if(WANT_SYNCAPI)
   add_definitions(-DTHREADED)
-  if(WIN32)
-    # Note that the generator expression ensures that `/MTd` is used when Debug
-    # configurations are built.
-    add_compile_options(/MT$<$<CONFIG:Debug>:d>)
-  endif()
 endif()
 
 # CppUnit option


Mime
View raw message