kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'cmliblzma-static' 

f05f5b01 cmliblzma: always build as static library
This commit is contained in:
Brad King 2016-06-29 09:07:36 -04:00 committed by CMake Topic Stage
parent cb93dc048f f05f5b01d0
commit 5e2c638072
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Utilities/cmliblzma/CMakeLists.txt
View File

@ -182,10 +182,6 @@ SET(LZMA_SRCS
liblzma/simple/x86.c 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) CONFIGURE_FILE(config.h.in config.h @ONLY)
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
@ -209,7 +205,7 @@ ELSEIF(CMAKE_C_COMPILER_ID STREQUAL "PathScale")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -woffall") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -woffall")
ENDIF() ENDIF()
ADD_LIBRARY(cmliblzma ${LZMA_SRCS}) ADD_LIBRARY(cmliblzma STATIC ${LZMA_SRCS})
IF(CMAKE_C_COMPILER_ID STREQUAL "XL") IF(CMAKE_C_COMPILER_ID STREQUAL "XL")
# Disable the XL compiler optimizer because it causes crashes # Disable the XL compiler optimizer because it causes crashes