Skip to content

Commit

Permalink
ODBC-164 Not including libmariadb into source package
Browse files Browse the repository at this point in the history
And thus, not trying to add libraiadb projects if there is no libmariadb
folder. But trying to link against library installed on the system
  • Loading branch information
lawrinn committed Jul 24, 2018
1 parent 8912f9f commit 145f157
Showing 1 changed file with 21 additions and 16 deletions.
37 changes: 21 additions & 16 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,12 @@ IF(WIN32)
ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
ENDIF()

INCLUDE(${CMAKE_SOURCE_DIR}/cmake/connector_c.cmake)
IF(EXISTS ${CMAKE_SOURCE_DIR}/libmariadb)
INCLUDE(${CMAKE_SOURCE_DIR}/cmake/connector_c.cmake)
ELSE()
SET(USE_SYSTEM_INSTALLED_LIB TRUE)
MESSAGE(STATUS "There is no Connector/C sub-project folder, linking against libmariadb installed on the system")
ENDIF()

IF(WIN32)
#ADD_OPTION(WITH_MSI "Build MSI installation package" OFF)
Expand Down Expand Up @@ -247,8 +252,12 @@ SET(LIBRARY_NAME "maodbc")
CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/mariadb-odbc-driver.def.in
${CMAKE_SOURCE_DIR}/mariadb-odbc-driver-uni.def)

IF(MARIADB_LINK_DYNAMIC)
SET(MARIADB_CLIENT_TARGET_NAME libmariadb)
IF(MARIADB_LINK_DYNAMIC)# OR USE_SYSTEM_INSTALLED_LIB)
IF(USE_SYSTEM_INSTALLED_LIB)
SET(MARIADB_CLIENT_TARGET_NAME mariadb)
ELSE()
SET(MARIADB_CLIENT_TARGET_NAME libmariadb)
ENDIF()
MESSAGE(STATUS "Linking Connector/C library dynamically(${MARIADB_CLIENT_TARGET_NAME})")
ELSE()
SET(MARIADB_CLIENT_TARGET_NAME mariadbclient)
Expand Down Expand Up @@ -363,21 +372,20 @@ SET(CPACK_SOURCE_PACKAGE_FILE_NAME "mariadb-connector-odbc-${CPACK_PACKAGE_VERSI
SET(CPACK_PACKAGE_CONTACT "info@mariadb.com")
SET(CPACK_PACKAGE_VENDOR "MariaDB Corporation AB")
SET(CPACK_SOURCE_IGNORE_FILES
test/
.git/
/test/
/.git/
.gitignore
.gitmodules
.gitattributes
CMakeCache.txt
cmake_dist.cmake
CPackSourceConfig.cmake
CPackConfig.cmake
.build/
/cmake_install.cmake
/CTestTestfile.cmake
/.build/
cmake_install.cmake
CTestTestfile.cmake
/CMakeFiles/
/version_resources/
/_CPack_Packages/
.*vcxproj
.*gz$
.*zip$
Expand All @@ -389,18 +397,15 @@ CPackConfig.cmake
.*pdb$
.*sln$
.*sdf$
/CMakeFiles/
/version_resources/
/_CPack_Packages/
Makefile$
/autom4te.cache/
libmariadb/win
libmariadb/client
libmariadb/examples
.travis/
/.travis/
.travis.yml
/libmariadb/
/_CPack_Packages/
)


# Build source packages
IF(GIT_BUILD_SRCPKG)
# get branch name
Expand Down

0 comments on commit 145f157

Please sign in to comment.