Skip to content

Commit cace488

Browse files
committed
avoid compiling objects twice: shared and static library now can be build in one step
1 parent 36c0422 commit cace488

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

libmariadb/CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,13 +144,14 @@ ELSE()
144144
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/zlib)
145145
ENDIF()
146146

147-
ADD_LIBRARY(mariadbclient STATIC ${LIBMARIADB_SOURCES})
147+
ADD_LIBRARY(mariadblib_core OBJECT ${LIBMARIADB_SOURCES})
148+
ADD_LIBRARY(mariadbclient STATIC $<TARGET_OBJECTS:mariadblib_core>)
148149
TARGET_LINK_LIBRARIES(mariadbclient ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS} ${MATH_LIBRARY} ${ICONV_LIBRARIES})
149150
IF(OPENSSL_FOUND)
150151
TARGET_LINK_LIBRARIES(mariadbclient ${SSL_LIBRARIES})
151152
ENDIF()
152153

153-
ADD_LIBRARY(libmariadb SHARED ${LIBMARIADB_SOURCES})
154+
ADD_LIBRARY(libmariadb SHARED $<TARGET_OBJECTS:mariadblib_core>)
154155
TARGET_LINK_LIBRARIES(libmariadb ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS} ${MATH_LIBRARY} ${ICONV_LIBRARIES})
155156

156157
IF(OPENSSL_FOUND)

0 commit comments

Comments
 (0)