Modified:
branches/cmake/CMakeLists.txt
branches/cmake/dsn-editor/CMakeLists.txt
branches/cmake/setup/CMakeLists.txt
Log:
Added QT support
Modified: branches/cmake/CMakeLists.txt
===================================================================
--- branches/cmake/CMakeLists.txt 2007-05-29 12:16:17 UTC (rev 444)
+++ branches/cmake/CMakeLists.txt 2007-05-29 16:05:11 UTC (rev 445)
@@ -60,15 +60,15 @@
ENDIF(COMPILE_RESULT)
#-----------------------------------------------------
+
+INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR})
+
ADD_SUBDIRECTORY(MYODBCDbg)
ADD_SUBDIRECTORY(dltest)
ADD_SUBDIRECTORY(driver)
ADD_SUBDIRECTORY(util)
-IF(QT_FOUND)
- INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR})
- ADD_SUBDIRECTORY(setup)
-ENDIF(QT_FOUND)
+ADD_SUBDIRECTORY(setup)
ADD_SUBDIRECTORY(installer)
ADD_SUBDIRECTORY(monitor)
Modified: branches/cmake/dsn-editor/CMakeLists.txt
===================================================================
--- branches/cmake/dsn-editor/CMakeLists.txt 2007-05-29 12:16:17 UTC (rev 444)
+++ branches/cmake/dsn-editor/CMakeLists.txt 2007-05-29 16:05:11 UTC (rev 445)
@@ -1,6 +1,6 @@
INCLUDE_DIRECTORIES(../util ../setup)
-ADD_LIBRARY(myodbc3c
+SET(myodbc3c_SRCS
main.cpp
../setup/MYODBCSetupAssistText.cpp
../setup/MYODBCSetupCheckBox.cpp
@@ -23,5 +23,29 @@
../setup/MYODBCSetupHandleInstallerError.c
../setup/MYODBCSetupLineEdit.cpp)
+SET(MOC_SRCS
+ ../setup/MYODBCSetupAssistText.h
+ ../setup/MYODBCSetupCheckBox.h
+ ../setup/MYODBCSetupComboBox.h
+ ../setup/MYODBCSetupComboBoxDatabases.h
+ ../setup/MYODBCSetupDataSourceDialog.h
+ ../setup/MYODBCSetupDataSourceTab1.h
+ ../setup/MYODBCSetupDataSourceTab2.h
+ ../setup/MYODBCSetupDataSourceTab3.h
+ ../setup/MYODBCSetupDataSourceTab3a.h
+ ../setup/MYODBCSetupDataSourceTab3b.h
+ ../setup/MYODBCSetupDataSourceTab3c.h
+ ../setup/MYODBCSetupDataSourceTab3d.h
+ ../setup/MYODBCSetupLineEdit.h)
-TARGET_LINK_LIBRARIES(myodbc3c ${QT_LIBRARIES})
+IF(QT_WRAP_CPP)
+ QT_WRAP_CPP(myodbc3c myodbc3c_SRCS ${MOC_SRCS})
+ENDIF(QT_WRAP_CPP)
+
+ADD_EXECUTABLE(myodbc3c ${myodbc3c_SRCS})
+
+IF(ODBC_WINDOWS)
+ TARGET_LINK_LIBRARIES(myodbc3c user32)
+ENDIF(ODBC_WINDOWS)
+
+TARGET_LINK_LIBRARIES(myodbc3c myodbc3u ${QT_LIBRARIES})
Modified: branches/cmake/setup/CMakeLists.txt
===================================================================
--- branches/cmake/setup/CMakeLists.txt 2007-05-29 12:16:17 UTC (rev 444)
+++ branches/cmake/setup/CMakeLists.txt 2007-05-29 16:05:11 UTC (rev 445)
@@ -1,4 +1,6 @@
INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR})
+
+
ADD_LIBRARY(myodbc3S
ConfigDSN.c
MYODBCSetupAssistText.cpp
@@ -22,5 +24,7 @@
MYODBCSetupHandleInstallerError.c
MYODBCSetupLineEdit.cpp
myodbc3S.rc)
+
+
TARGET_LINK_LIBRARIES(myodbc3S ${QT_LIBRARIES})
| Thread |
|---|
| • Connector/ODBC 3.51 commit: r445 - in branches/cmake: . dsn-editor setup | grichter | 29 May |
