diff options
| author | Brad King <brad.king@kitware.com> | 2016-06-29 13:07:36 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-06-29 13:07:36 (GMT) |
| commit | 5e2c63807278ca036da30ca718af9177b2a3340d (patch) | |
| tree | 7bcf0bb4fa053269b387a79aff76bb7ce2461eb1 | |
| parent | cb93dc048f80d2724fa22881327d92a4b7e3f503 (diff) | |
| parent | f05f5b01d0a690e5f3e06be2c702ee659433c326 (diff) | |
| download | CMake-5e2c63807278ca036da30ca718af9177b2a3340d.zip CMake-5e2c63807278ca036da30ca718af9177b2a3340d.tar.gz CMake-5e2c63807278ca036da30ca718af9177b2a3340d.tar.bz2 | |
Merge topic 'cmliblzma-static'
f05f5b01 cmliblzma: always build as static library
| -rw-r--r-- | Utilities/cmliblzma/CMakeLists.txt | 6 |
1 files changed, 1 insertions, 5 deletions
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 |