diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-10-27 20:46:18 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-10-27 20:46:38 +0200 |
| commit | 37ab7e45963627f3c1ea2dd43d5b305de37bb16f (patch) | |
| tree | e07ada7fbde72c438f2a6a6c162e050caf1950f9 /cmake/libutils.cmake | |
| parent | 30c3d6db328d73f1b30be537aceb55d37936fdb9 (diff) | |
| parent | 893ebb739e24637985892da1555f2e6f1a8ac5b6 (diff) | |
| download | mariadb-git-37ab7e45963627f3c1ea2dd43d5b305de37bb16f.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'cmake/libutils.cmake')
| -rw-r--r-- | cmake/libutils.cmake | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/cmake/libutils.cmake b/cmake/libutils.cmake index 2e65e8b5ba3..2a218bc63b0 100644 --- a/cmake/libutils.cmake +++ b/cmake/libutils.cmake @@ -136,6 +136,10 @@ MACRO(MERGE_STATIC_LIBS TARGET OUTPUT_NAME LIBS_TO_MERGE) SET(SOURCE_FILE ${CMAKE_CURRENT_BINARY_DIR}/${TARGET}_depends.c) ADD_LIBRARY(${TARGET} STATIC ${SOURCE_FILE}) SET_TARGET_PROPERTIES(${TARGET} PROPERTIES OUTPUT_NAME ${OUTPUT_NAME}) + IF(NOT _SKIP_PIC) + SET_TARGET_PROPERTIES(${TARGET} PROPERTIES COMPILE_FLAGS + "${CMAKE_SHARED_LIBRARY_C_FLAGS}") + ENDIF() SET(OSLIBS) FOREACH(LIB ${LIBS_TO_MERGE}) @@ -240,11 +244,11 @@ MACRO(MERGE_LIBRARIES) # check for non-PIC libraries IF(NOT _SKIP_PIC) FOREACH(LIB ${LIBS}) - GET_TARGET_PROPERTY(${LIB} TYPE LIBTYPE) - IF(LIBTYPE STREQUAL "STATIC_LIBRARY") - GET_TARGET_PROPERTY(LIB COMPILE_FLAGS LIB_COMPILE_FLAGS) + GET_TARGET_PROPERTY(LTYPE ${LIB} TYPE) + IF(LTYPE STREQUAL "STATIC_LIBRARY") + GET_TARGET_PROPERTY(LIB_COMPILE_FLAGS ${LIB} COMPILE_FLAGS) STRING(REPLACE "${CMAKE_SHARED_LIBRARY_C_FLAGS}" - "<PIC_FLAG>" LIB_COMPILE_FLAGS ${LIB_COMPILE_FLAG}) + "<PIC_FLAG>" LIB_COMPILE_FLAGS "${LIB_COMPILE_FLAGS}") IF(NOT LIB_COMPILE_FLAGS MATCHES "<PIC_FLAG>") MESSAGE(FATAL_ERROR "Attempted to link non-PIC static library ${LIB} to shared library ${TARGET}\n" |