generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-04-16 06:56:41 +02:00
Code Issues Projects Releases Wiki Activity

bugfix: #2809750 (iodbc on OSX)

Browse Source
This commit is contained in:
Marian Krivos 2009-06-22 18:41:44 +00:00
parent eaa622aca3
commit 56c8ac698e
2 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Data/CMakeLists.txt
View File

@ -38,11 +38,12 @@ endif(MYSQL_FOUND)
include(../contrib/cmake/FindODBC.cmake) include(../contrib/cmake/FindODBC.cmake)
if(${ODBC_CONFIG} MATCHES "ODBC_CONFIG-NOTFOUND") if ( ${UNIX_ODBC_CONFIG} STREQUAL UNIX_ODBC_CONFIG-NOTFOUND AND ${IODBC_CONFIG} STREQUAL IODBC_CONFIG-NOTFOUND)
message("ODBC Support Disabled - no ODBC runtime") message(STATUS "ODBC Support Disabled - no ODBC runtime")
else(${ODBC_CONFIG} MATCHES "ODBC_CONFIG-NOTFOUND") else ()
message(STATUS "ODBC Support Enabled")
add_subdirectory( ODBC ) add_subdirectory( ODBC )
endif(${ODBC_CONFIG} MATCHES "ODBC_CONFIG-NOTFOUND") endif ()
add_subdirectory( samples ) add_subdirectory( samples )
add_subdirectory( testsuite ) add_subdirectory( testsuite )

42
contrib/cmake/FindODBC.cmake
View File

@ -1,37 +1,35 @@
# check for location of odbc_config # check for location of odbc_config
find_program(ODBC_CONFIG odbc_config find_program(UNIX_ODBC_CONFIG odbc_config
$ENV{ODBC_PATH}/bin $ENV{ODBC_PATH}/bin
/usr/bin /usr/bin
/usr/local/bin /usr/local/bin
PATHS) PATHS)
if(${ODBC_CONFIG} MATCHES "ODBC_CONFIG-NOTFOUND") if(${UNIX_ODBC_CONFIG} MATCHES "UNIX_ODBC_CONFIG-NOTFOUND")
message(STATUS "Couldn't find unixODBC") message(STATUS "Couldn't find unixODBC")
else(${ODBC_CONFIG} MATCHES "ODBC_CONFIG-NOTFOUND") else(${UNIX_ODBC_CONFIG} MATCHES "UNIX_ODBC_CONFIG-NOTFOUND")
message(STATUS "Found unixODBC: odbc_config in ${ODBC_CONFIG}") message(STATUS "Found unixODBC: odbc_config in ${UNIX_ODBC_CONFIG}")
exec_program(${ODBC_CONFIG} ARGS "--include-prefix" OUTPUT_VARIABLE ODBC_INCLUDE_DIR) exec_program(${UNIX_ODBC_CONFIG} ARGS "--include-prefix" OUTPUT_VARIABLE ODBC_INCLUDE_DIR)
include_directories(${ODBC_INCLUDE_DIR}) include_directories(${ODBC_INCLUDE_DIR})
exec_program(${ODBC_CONFIG} ARGS "--libs" OUTPUT_VARIABLE ODBC_LINK_FLAGS) exec_program(${UNIX_ODBC_CONFIG} ARGS "--libs" OUTPUT_VARIABLE ODBC_LINK_FLAGS)
add_definitions(-DPOCO_UNIXODBC) add_definitions(-DPOCO_UNIXODBC)
endif(${ODBC_CONFIG} MATCHES "ODBC_CONFIG-NOTFOUND") endif(${UNIX_ODBC_CONFIG} MATCHES "UNIX_ODBC_CONFIG-NOTFOUND")
if(${ODBC_CONFIG} MATCHES "ODBC_CONFIG-NOTFOUND") find_program(IODBC_CONFIG iodbc-config
find_program(ODBC_CONFIG iodbc-config
$ENV{ODBC_PATH}/bin $ENV{ODBC_PATH}/bin
/usr/bin /usr/bin
/usr/local/bin /usr/local/bin
PATHS) PATHS)
if(${ODBC_CONFIG} MATCHES "ODBC_CONFIG-NOTFOUND")
message(STATUS "Couldn't find iODBC")
else(${ODBC_CONFIG} MATCHES "ODBC_CONFIG-NOTFOUND")
message(STATUS "Found iODBC: iodbc-config in ${ODBC_CONFIG}")
exec_program(${ODBC_CONFIG} ARGS "--cflags" OUTPUT_VARIABLE ODBC_CFLAGS)
add_definitions( ${ODBC_CFLAGS} )
exec_program(${ODBC_CONFIG} ARGS "--libs" OUTPUT_VARIABLE ODBC_LINK_FLAGS)
add_definitions(-DPOCO_IODBC)
endif(${ODBC_CONFIG} MATCHES "ODBC_CONFIG-NOTFOUND")
endif(${ODBC_CONFIG} MATCHES "ODBC_CONFIG-NOTFOUND")
if(${ODBC_CONFIG} MATCHES "ODBC_CONFIG-NOTFOUND") if(${IODBC_CONFIG} MATCHES "IODBC_CONFIG-NOTFOUND")
#try odbc32.lib on windows message(STATUS "Couldn't find iODBC")
endif(${ODBC_CONFIG} MATCHES "ODBC_CONFIG-NOTFOUND") else(${IODBC_CONFIG} MATCHES "IODBC_CONFIG-NOTFOUND")
message(STATUS "Found iODBC: iodbc-config in ${IODBC_CONFIG}")
exec_program(${IODBC_CONFIG} ARGS "--cflags" OUTPUT_VARIABLE ODBC_CFLAGS)
add_definitions( ${ODBC_CFLAGS} )
exec_program(${IODBC_CONFIG} ARGS "--libs" OUTPUT_VARIABLE ODBC_LINK_FLAGS)
add_definitions(-DPOCO_IODBC)
endif(${IODBC_CONFIG} MATCHES "IODBC_CONFIG-NOTFOUND")
message(STATUS "UNIX ODBC: ${UNIX_ODBC_CONFIG}")
message(STATUS "IODBC: ${IODBC_CONFIG}")