SOCI+ODBC Linux

unitpoint · Apr 1, 2014 · 4cfc5b6 · 4cfc5b6
1 parent d5031a1
commit 4cfc5b6
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 67 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -289,9 +289,9 @@ list(APPEND HEADERS src/ext-odbo/os-odbo.h)
 list(APPEND SOURCES src/ext-iconv/os-iconv.cpp)
 list(APPEND HEADERS src/ext-iconv/os-iconv.h)
 
-include_directories(3rdparty/libiconv-1.14/libcharset/include)
-include_directories(3rdparty/libiconv-1.14/include)
-include_directories(3rdparty/libiconv-1.14/lib)
+include_directories(BEFORE 3rdparty/libiconv-1.14/libcharset/include)
+include_directories(BEFORE 3rdparty/libiconv-1.14/include)
+include_directories(BEFORE 3rdparty/libiconv-1.14/lib)
 
 list(APPEND SOURCES 3rdparty/libiconv-1.14/libcharset/lib/localcharset.c)
 list(APPEND SOURCES 3rdparty/libiconv-1.14/lib/iconv.c)

diff --git a/FindMySQL.cmake b/FindMySQL.cmake
@@ -13,12 +13,13 @@ ENDIF (MYSQL_INCLUDE_DIR)
 FIND_PATH(MYSQL_INCLUDE_DIR mysql.h
   /usr/local/include/mysql
   /usr/include/mysql
+  /opt/local/include/mysql5/mysql
 )
 
 SET(MYSQL_NAMES mysqlclient_r)
 FIND_LIBRARY(MYSQL_LIBRARY
   NAMES ${MYSQL_NAMES}
-  PATHS /usr/lib /usr/lib/i386-linux-gnu /usr/lib32
+  PATHS /opt/local/lib/mysql5/mysql /usr/lib /usr/lib/i386-linux-gnu /usr/lib32
 )
 
 IF (MYSQL_INCLUDE_DIR AND MYSQL_LIBRARY)

diff --git a/FindODBC.cmake b/FindODBC.cmake
diff --git a/FindSoci.cmake b/FindSoci.cmake
@@ -34,7 +34,7 @@ SET(_SOCI_REQUIRED_VARS  SOCI_INCLUDE_DIR SOCI_LIBRARY)
 #
 FIND_PATH(
     SOCI_INCLUDE_DIR soci.h
-    PATH "/usr/local"
+    PATH "/usr/local" "/opt/local"
     PATH_SUFFIXES "" "soci"
     DOC "Soci (http://soci.sourceforge.net) include directory")
 MARK_AS_ADVANCED(SOCI_INCLUDE_DIR)