Merge branch 'master' of https://github.com/MariaDB/mariadb-connector-c

mariadb-corporation · Jul 6, 2018 · 23ec0ca · 23ec0ca
2 parents b0f2e4e + c14a06f
commit 23ec0ca
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/libmariadb/CMakeLists.txt b/libmariadb/CMakeLists.txt
@@ -387,7 +387,7 @@ ADD_LIBRARY(mariadbclient STATIC  ${MARIADB_OBJECTS} ${EMPTY_FILE})
 TARGET_LINK_LIBRARIES(mariadbclient ${SYSTEM_LIBS})
 
 IF(UNIX)
-  ADD_LIBRARY(libmariadb SHARED ${libmariadb_RC} ${MARIADB_OBJECTS} ${EMPTY_FILE} mariadbclient.def)
+  ADD_LIBRARY(libmariadb SHARED ${libmariadb_RC} ${MARIADB_OBJECTS} ${EMPTY_FILE})
   SET_TARGET_PROPERTIES(libmariadb PROPERTIES COMPILE_FLAGS "${CMAKE_SHARED_LIBRARY_C_FLAGS}")
 ELSE()
   ADD_LIBRARY(libmariadb SHARED ${libmariadb_RC} mariadbclient.def)
@@ -407,7 +407,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
   IF (NOT WITH_ASAN)
     TARGET_LINK_LIBRARIES (libmariadb "-Wl,--no-undefined")
   ENDIF()
-  TARGET_LINK_LIBRARIES (libmariadb "${CC_BINARY_DIR}/libmariadb/mariadbclient.def")
+  SET_TARGET_PROPERTIES(libmariadb PROPERTIES LINK_FLAGS "${CC_BINARY_DIR}/libmariadb/mariadbclient.def")
 ENDIF()
 
 SET_TARGET_PROPERTIES(mariadbclient PROPERTIES IMPORTED_INTERFACE_LINK_LIBRARIES "${SYSTEM_LIBS}")
@@ -450,4 +450,4 @@ IF(WIN32)
    INSTALL(FILES ${PDB_LOCATION} DESTINATION "${INSTALL_LIBDIR}"
            COMPONENT Development)
   ENDIF()
-ENDIF()
+ENDIF()