[Cmake-commits] CMake branch, next, updated. v3.2.1-1639-g21453f9
Brad King
brad.king at kitware.com
Wed Apr 8 13:56:01 EDT 2015
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 21453f911565fe00671107b49e0193c066d6ec49 (commit)
via e5d336beb27ea06a0f5058d0ae87c7cd84b8b4b4 (commit)
from e830e12572e5e2e617bca1b849992d1016bb262f (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=21453f911565fe00671107b49e0193c066d6ec49
commit 21453f911565fe00671107b49e0193c066d6ec49
Merge: e830e12 e5d336b
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Apr 8 13:56:00 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Apr 8 13:56:00 2015 -0400
Merge topic 'fix-liblzma-optimize' into next
e5d336be liblzma: Disable GNU 3.3 compiler optimizations
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e5d336beb27ea06a0f5058d0ae87c7cd84b8b4b4
commit e5d336beb27ea06a0f5058d0ae87c7cd84b8b4b4
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Apr 8 13:52:02 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Apr 8 13:52:02 2015 -0400
liblzma: Disable GNU 3.3 compiler optimizations
The GNU 3.3 optimizer causes bad behavior in liblzma, so disable it.
diff --git a/Utilities/cmliblzma/CMakeLists.txt b/Utilities/cmliblzma/CMakeLists.txt
index 991c699..8920536 100644
--- a/Utilities/cmliblzma/CMakeLists.txt
+++ b/Utilities/cmliblzma/CMakeLists.txt
@@ -215,6 +215,10 @@ IF(CMAKE_C_COMPILER_ID STREQUAL "XL")
# Disable the XL compiler optimizer because it causes crashes
# and other bad behavior in liblzma code.
SET_PROPERTY(TARGET cmliblzma PROPERTY COMPILE_FLAGS "-qnooptimize")
+ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "GNU" AND
+ CMAKE_C_COMPILER_VERSION VERSION_LESS 3.4)
+ # Disable the old GNU compiler optimizer.
+ SET_PROPERTY(TARGET cmliblzma PROPERTY COMPILE_FLAGS "-O0")
ENDIF()
INSTALL(FILES COPYING DESTINATION ${CMAKE_DOC_DIR}/cmliblzma)
-----------------------------------------------------------------------
Summary of changes:
Utilities/cmliblzma/CMakeLists.txt | 4 ++++
1 file changed, 4 insertions(+)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list