This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via c664b95b08f793808d881ed08919bfa1a7fce409 (commit)
via f05f5b01d0a690e5f3e06be2c702ee659433c326 (commit)
from 0172bc17b57d7a0b7b3a244124b41cb71cdbc4fa (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c664b95b08f793808d881ed08919bfa1a7fce409
commit c664b95b08f793808d881ed08919bfa1a7fce409
Merge: 0172bc1 f05f5b0
Author: Daniel Pfeifer <dan...@pfeifer-mail.de>
AuthorDate: Tue Jun 28 17:06:15 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Jun 28 17:06:15 2016 -0400
Merge topic 'cmliblzma-static' into next
f05f5b01 cmliblzma: always build as static library
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f05f5b01d0a690e5f3e06be2c702ee659433c326
commit f05f5b01d0a690e5f3e06be2c702ee659433c326
Author: Daniel Pfeifer <dan...@pfeifer-mail.de>
AuthorDate: Tue Jun 28 23:05:37 2016 +0200
Commit: Daniel Pfeifer <dan...@pfeifer-mail.de>
CommitDate: Tue Jun 28 23:05:37 2016 +0200
cmliblzma: always build as static library
diff --git a/Utilities/cmliblzma/CMakeLists.txt
b/Utilities/cmliblzma/CMakeLists.txt
index 8920536..e806680 100644
--- a/Utilities/cmliblzma/CMakeLists.txt
+++ b/Utilities/cmliblzma/CMakeLists.txt
@@ -182,10 +182,6 @@ SET(LZMA_SRCS
liblzma/simple/x86.c
)
-IF(WIN32 AND BUILD_SHARED_LIBS)
- SET(LZMA_SRCS ${LZMA_SRCS} liblzma/liblzma_w32res.rc)
-ENDIF()
-
CONFIGURE_FILE(config.h.in config.h @ONLY)
INCLUDE_DIRECTORIES(
@@ -209,7 +205,7 @@ ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "PathScale")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -woffall")
ENDIF()
-ADD_LIBRARY(cmliblzma ${LZMA_SRCS})
+ADD_LIBRARY(cmliblzma STATIC ${LZMA_SRCS})
IF(CMAKE_C_COMPILER_ID STREQUAL "XL")
# Disable the XL compiler optimizer because it causes crashes
-----------------------------------------------------------------------
Summary of changes:
Utilities/cmliblzma/CMakeLists.txt | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
