Added:
branches/cmake/installer/CMakeLists.txt
Modified:
branches/cmake/CMakeLists.txt
branches/cmake/cmake/FindMySQL.cmake
branches/cmake/dltest/CMakeLists.txt
branches/cmake/driver/CMakeLists.txt
branches/cmake/dsn-editor/CMakeLists.txt
branches/cmake/setup/CMakeLists.txt
branches/cmake/test/CMakeLists.txt
branches/cmake/util/CMakeLists.txt
Log:
Windows cmake fixes
Modified: branches/cmake/CMakeLists.txt
===================================================================
--- branches/cmake/CMakeLists.txt 2007-05-29 06:08:31 UTC (rev 443)
+++ branches/cmake/CMakeLists.txt 2007-05-29 12:16:17 UTC (rev 444)
@@ -38,7 +38,7 @@
ADD_DEFINITIONS(-DUSE_SQLCOLATTRIBUTE_SQLLEN_PTR)
ELSE(COMPILE_RESULT)
TRY_COMPILE(COMPILE_RESULT1 ${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/cmake/sqlcolattrib2.c)
- MESSAGE("-- Checking if SQLColAttribute last arg is compatible with SQLPOINTER -
${COMPILE_RESULT}1")
+ MESSAGE("-- Checking if SQLColAttribute last arg is compatible with SQLPOINTER -
${COMPILE_RESULT1}")
IF(COMPILE_RESULT1)
ADD_DEFINITIONS(-DUSE_SQLCOLATTRIBUTE_SQLPOINTER)
@@ -60,8 +60,6 @@
ENDIF(COMPILE_RESULT)
#-----------------------------------------------------
-
-
ADD_SUBDIRECTORY(MYODBCDbg)
ADD_SUBDIRECTORY(dltest)
ADD_SUBDIRECTORY(driver)
Modified: branches/cmake/cmake/FindMySQL.cmake
===================================================================
--- branches/cmake/cmake/FindMySQL.cmake 2007-05-29 06:08:31 UTC (rev 443)
+++ branches/cmake/cmake/FindMySQL.cmake 2007-05-29 12:16:17 UTC (rev 444)
@@ -1,4 +1,4 @@
-IF (NOT MYSQL_INCLUDE)
+IF (NOT MYSQL_INCLUDE_DIR)
find_path(MYSQL_INCLUDE_DIR mysql.h
/usr/include/mysql
/usr/local/include/mysql
@@ -9,7 +9,7 @@
$ENV{ProgramFiles}/MySQL/*/include
$ENV{SystemDrive}/MySQL/*/include)
MESSAGE("-- checking for mysql.h - ${MYSQL_INCLUDE_DIR}")
-ENDIF (NOT MYSQL_INCLUDE)
+ENDIF (NOT MYSQL_INCLUDE_DIR)
IF (NOT MYSQL_LIB_DIR)
IF (ODBC_WINDOWS)
@@ -35,3 +35,6 @@
MESSAGE(SEND_ERROR "Couldn't find MySQL include files and/or library. Please set
environment variables MYSQL_INCLUDE_DIR and MYSQL_LIB_DIR")
ENDIF(NOT MYSQL_INCLUDE_DIR OR NOT MYSQL_LIB_DIR)
+INCLUDE_DIRECTORIES(${MYSQL_INCLUDE_DIR})
+LINK_DIRECTORIES(${MYSQL_LIB_DIR})
+
Modified: branches/cmake/dltest/CMakeLists.txt
===================================================================
--- branches/cmake/dltest/CMakeLists.txt 2007-05-29 06:08:31 UTC (rev 443)
+++ branches/cmake/dltest/CMakeLists.txt 2007-05-29 12:16:17 UTC (rev 444)
@@ -1,3 +1,7 @@
+IF(${ODBC_WINDOWS})
+ SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -MT")
+ENDIF(${ODBC_WINDOWS})
+
ADD_EXECUTABLE(dltest dltest.c)
IF(${ODBC_UNIX})
Modified: branches/cmake/driver/CMakeLists.txt
===================================================================
--- branches/cmake/driver/CMakeLists.txt 2007-05-29 06:08:31 UTC (rev 443)
+++ branches/cmake/driver/CMakeLists.txt 2007-05-29 12:16:17 UTC (rev 444)
@@ -2,8 +2,12 @@
IF(${ODBC_WINDOWS})
ADD_DEFINITIONS(-D__WIN__ -DENGLISH -DMYODBC_EXPORTS -D_USERDLL -DDONT_DEFINE_VOID)
+ ADD_DEFINITIONS(-D_WIN32 -DWIN32 -D_WINDOWS -D__WIN__)
+ STRING(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE})
+ SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB:msvcrt")
ENDIF(${ODBC_WINDOWS})
+
ADD_LIBRARY(myodbc3 SHARED catalog.c connect.c cursor.c dll.c error.c execute.c handle.c
info.c myodbc3.c
options.c prepare.c results.c transact.c utility.c
../util/MYODBCUtilAllocDataSource.c ../util/MYODBCUtilAllocDriver.c
@@ -28,12 +32,17 @@
../MYODBCDbg/MYODBCDbgLib/MYODBCDbgStmtAttrString.c
../MYODBCDbg/MYODBCDbgLib/MYODBCDbgStmtOptionString.c
../MYODBCDbg/MYODBCDbgLib/MYODBCDbgStmtTypeString.c
- ../MYODBCDbg/MYODBCDbgLib/MYODBCDbgTransactionTypeString.c)
+ ../MYODBCDbg/MYODBCDbgLib/MYODBCDbgTransactionTypeString.c
+ myodbc3.rc)
IF(ODBC_UNIX)
-TARGET_LINK_LIBRARIES(myodbc3 ltdl)
+TARGET_LINK_LIBRARIES(myodbc3 ltdl mysqlclient_r)
ENDIF(ODBC_UNIX)
+IF (ODBC_WINDOWS)
+TARGET_LINK_LIBRARIES(myodbc3 user32 advapi32 wsock32 mysqlclient zlib odbc32 odbccp32)
+ENDIF (ODBC_WINDOWS)
+
TARGET_LINK_LIBRARIES(myodbc3 ${ODBCLIB} ${ODBCINSTLIB} myodbc3u)
Modified: branches/cmake/dsn-editor/CMakeLists.txt
===================================================================
--- branches/cmake/dsn-editor/CMakeLists.txt 2007-05-29 06:08:31 UTC (rev 443)
+++ branches/cmake/dsn-editor/CMakeLists.txt 2007-05-29 12:16:17 UTC (rev 444)
@@ -24,4 +24,4 @@
../setup/MYODBCSetupLineEdit.cpp)
-
+TARGET_LINK_LIBRARIES(myodbc3c ${QT_LIBRARIES})
Added: branches/cmake/installer/CMakeLists.txt
===================================================================
--- branches/cmake/installer/CMakeLists.txt 2007-05-29 06:08:31 UTC (rev 443)
+++ branches/cmake/installer/CMakeLists.txt 2007-05-29 12:16:17 UTC (rev 444)
@@ -0,0 +1,7 @@
+ADD_EXECUTABLE(myodbc3i myodbc3i.c)
+TARGET_LINK_LIBRARIES(myodbc3i myodbc3u)
+
+IF (ODBC_UNIX)
+ TARGET_LINK_LIBRARIES(myodbc3i myodbc3u ${ODBCLIB} ${ODBCINSTLIB} ltdl)
+ENDIF (ODBC_UNIX)
+
Modified: branches/cmake/setup/CMakeLists.txt
===================================================================
--- branches/cmake/setup/CMakeLists.txt 2007-05-29 06:08:31 UTC (rev 443)
+++ branches/cmake/setup/CMakeLists.txt 2007-05-29 12:16:17 UTC (rev 444)
@@ -1,5 +1,5 @@
-
-ADD_LIBRARY(myodbc3s
+INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR})
+ADD_LIBRARY(myodbc3S
ConfigDSN.c
MYODBCSetupAssistText.cpp
MYODBCSetupCheckBox.cpp
@@ -20,5 +20,7 @@
MYODBCSetupDriverConnect.c
MYODBCSetupDriverConnectPrompt.cpp
MYODBCSetupHandleInstallerError.c
- MYODBCSetupLineEdit.cpp)
-
+ MYODBCSetupLineEdit.cpp
+ myodbc3S.rc)
+TARGET_LINK_LIBRARIES(myodbc3S ${QT_LIBRARIES})
+
Modified: branches/cmake/test/CMakeLists.txt
===================================================================
--- branches/cmake/test/CMakeLists.txt 2007-05-29 06:08:31 UTC (rev 443)
+++ branches/cmake/test/CMakeLists.txt 2007-05-29 12:16:17 UTC (rev 444)
@@ -1,65 +1,65 @@
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/test/include)
ADD_EXECUTABLE(my_basics my_basics.c)
-TARGET_LINK_LIBRARIES(my_basics myodbc3 myodbc3u iodbcinst mysqlclient)
+TARGET_LINK_LIBRARIES(my_basics myodbc3 myodbc3u mysqlclient)
ADD_EXECUTABLE(my_basics my_blob.c)
-TARGET_LINK_LIBRARIES(my_basics myodbc3 myodbc3u iodbcinst mysqlclient)
+TARGET_LINK_LIBRARIES(my_basics myodbc3 myodbc3u mysqlclient)
ADD_EXECUTABLE(my_bulk my_bulk.c)
-TARGET_LINK_LIBRARIES(my_bulk myodbc3 myodbc3u iodbcinst mysqlclient)
+TARGET_LINK_LIBRARIES(my_bulk myodbc3 myodbc3u mysqlclient)
ADD_EXECUTABLE(my_catalog my_catalog.c)
-TARGET_LINK_LIBRARIES(my_catalog myodbc3 myodbc3u iodbcinst mysqlclient)
+TARGET_LINK_LIBRARIES(my_catalog myodbc3 myodbc3u mysqlclient)
ADD_EXECUTABLE(my_curext my_curext.c)
-TARGET_LINK_LIBRARIES(my_curext myodbc3 myodbc3u iodbcinst mysqlclient)
+TARGET_LINK_LIBRARIES(my_curext myodbc3 myodbc3u mysqlclient)
ADD_EXECUTABLE(my_cursor my_cursor.c)
-TARGET_LINK_LIBRARIES(my_cursor myodbc3 myodbc3u iodbcinst mysqlclient)
+TARGET_LINK_LIBRARIES(my_cursor myodbc3 myodbc3u mysqlclient)
ADD_EXECUTABLE(my_datetime my_datetime.c)
-TARGET_LINK_LIBRARIES(my_datetime myodbc3 myodbc3u iodbcinst mysqlclient)
+TARGET_LINK_LIBRARIES(my_datetime myodbc3 myodbc3u mysqlclient)
ADD_EXECUTABLE(my_dyn_cursor my_dyn_cursor.c)
-TARGET_LINK_LIBRARIES(my_dyn_cursor myodbc3 myodbc3u iodbcinst mysqlclient)
+TARGET_LINK_LIBRARIES(my_dyn_cursor myodbc3 myodbc3u mysqlclient)
ADD_EXECUTABLE(my_error my_error.c)
-TARGET_LINK_LIBRARIES(my_error myodbc3 myodbc3u iodbcinst mysqlclient)
+TARGET_LINK_LIBRARIES(my_error myodbc3 myodbc3u mysqlclient)
ADD_EXECUTABLE(my_info my_info.c)
-TARGET_LINK_LIBRARIES(my_info myodbc3 myodbc3u iodbcinst mysqlclient)
+TARGET_LINK_LIBRARIES(my_info myodbc3 myodbc3u mysqlclient)
ADD_EXECUTABLE(my_keys my_keys.c)
-TARGET_LINK_LIBRARIES(my_keys myodbc3 myodbc3u iodbcinst mysqlclient)
+TARGET_LINK_LIBRARIES(my_keys myodbc3 myodbc3u mysqlclient)
ADD_EXECUTABLE(my_param my_param.c)
-TARGET_LINK_LIBRARIES(my_param myodbc3 myodbc3u iodbcinst mysqlclient)
+TARGET_LINK_LIBRARIES(my_param myodbc3 myodbc3u mysqlclient)
ADD_EXECUTABLE(my_position my_position.c)
-TARGET_LINK_LIBRARIES(my_position myodbc3 myodbc3u iodbcinst mysqlclient)
+TARGET_LINK_LIBRARIES(my_position myodbc3 myodbc3u mysqlclient)
ADD_EXECUTABLE(my_prepare my_prepare.c)
-TARGET_LINK_LIBRARIES(my_prepare myodbc3 myodbc3u iodbcinst mysqlclient)
+TARGET_LINK_LIBRARIES(my_prepare myodbc3 myodbc3u mysqlclient)
ADD_EXECUTABLE(my_relative my_relative.c)
-TARGET_LINK_LIBRARIES(my_relative myodbc3 myodbc3u iodbcinst mysqlclient)
+TARGET_LINK_LIBRARIES(my_relative myodbc3 myodbc3u mysqlclient)
ADD_EXECUTABLE(my_result my_result.c)
-TARGET_LINK_LIBRARIES(my_result myodbc3 myodbc3u iodbcinst mysqlclient)
+TARGET_LINK_LIBRARIES(my_result myodbc3 myodbc3u mysqlclient)
ADD_EXECUTABLE(my_scroll my_scroll.c)
-TARGET_LINK_LIBRARIES(my_scroll myodbc3 myodbc3u iodbcinst mysqlclient)
+TARGET_LINK_LIBRARIES(my_scroll myodbc3 myodbc3u mysqlclient)
ADD_EXECUTABLE(my_tran my_tran.c)
-TARGET_LINK_LIBRARIES(my_tran myodbc3 myodbc3u iodbcinst mysqlclient)
+TARGET_LINK_LIBRARIES(my_tran myodbc3 myodbc3u mysqlclient)
ADD_EXECUTABLE(my_types my_types.c)
-TARGET_LINK_LIBRARIES(my_types myodbc3 myodbc3u iodbcinst mysqlclient)
+TARGET_LINK_LIBRARIES(my_types myodbc3 myodbc3u mysqlclient)
ADD_EXECUTABLE(my_unixodbc my_unixodbc.c)
-TARGET_LINK_LIBRARIES(my_unixodbc myodbc3 myodbc3u iodbcinst mysqlclient)
+TARGET_LINK_LIBRARIES(my_unixodbc myodbc3 myodbc3u mysqlclient)
ADD_EXECUTABLE(my_use_result my_use_result.c)
-TARGET_LINK_LIBRARIES(my_use_result myodbc3 myodbc3u iodbcinst mysqlclient)
+TARGET_LINK_LIBRARIES(my_use_result myodbc3 myodbc3u mysqlclient)
Modified: branches/cmake/util/CMakeLists.txt
===================================================================
--- branches/cmake/util/CMakeLists.txt 2007-05-29 06:08:31 UTC (rev 443)
+++ branches/cmake/util/CMakeLists.txt 2007-05-29 12:16:17 UTC (rev 444)
@@ -1,4 +1,9 @@
-ADD_LIBRARY(myodbc3u MYODBCUtilAllocDataSource.c
+IF(${ODBC_WINDOWS})
+ SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -MT")
+# SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB")
+ENDIF(${ODBC_WINDOWS})
+
+ADD_LIBRARY(myodbc3u STATIC MYODBCUtilAllocDataSource.c
MYODBCUtilAllocDriver.c
MYODBCUtilClearDataSource.c
MYODBCUtilClearDriver.c
@@ -17,4 +22,7 @@
MYODBCUtilWriteDataSource.c
MYODBCUtilWriteDataSourceStr.c
MYODBCUtilWriteDriver.c)
+IF(${ODBC_WINDOWS})
+TARGET_LINK_LIBRARIES(myodbc3u odbc32.lib odbccp32.lib)
+ENDIF(${ODBC_WINDOWS})
| Thread |
|---|
| • Connector/ODBC 3.51 commit: r444 - in branches/cmake: . cmake dltest driver dsn-editor installer setup test util | grichter | 29 May |
