mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-13 13:37:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[9395] Update cmake for mysql_to_pgsql.

Browse source
This commit is contained in:
AlexDereka 2010-02-15 22:02:41 +03:00
parent 500b91c049
commit 9653831074
3 changed files with 9 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

14
contrib/mysql_to_pgsql/cmake/FindMySQL.cmake
View file

@ -12,11 +12,8 @@ IF (MYSQL_INCLUDE_DIR)
ENDIF (MYSQL_INCLUDE_DIR) ENDIF (MYSQL_INCLUDE_DIR)
FIND_PATH(MYSQL_INCLUDE_DIR mysql.h FIND_PATH(MYSQL_INCLUDE_DIR mysql.h
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 6.0;Location]/include" $ENV{ProgramFiles}/MySQL/*/include
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.1;Location]/include" $ENV{SystemDrive}/MySQL/*/include
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.0;Location]/include"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 4.1;Location]/include"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 4.0;Location]/include"
/usr/local/mysql/include /usr/local/mysql/include
/usr/local/include/mysql /usr/local/include/mysql
/usr/local/include /usr/local/include
@ -31,11 +28,8 @@ ELSE(MSVC)
SET(MYSQL_NAMES mysqlclient mysqlclient_r) SET(MYSQL_NAMES mysqlclient mysqlclient_r)
ENDIF(MSVC) ENDIF(MSVC)
SET(MYSQL_SEARCH_LIB_PATHS SET(MYSQL_SEARCH_LIB_PATHS
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 6.0;Location]/lib/opt" $ENV{ProgramFiles}/MySQL/*/lib/opt
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.1;Location]/lib/opt" $ENV{SystemDrive}/MySQL/*/lib/opt
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.0;Location]/lib/opt"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 4.1;Location]/lib/opt"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 4.0;Location]/lib/opt"
/usr/local/mysql/lib /usr/local/mysql/lib
/usr/local/lib/mysql /usr/local/lib/mysql
/usr/local/lib /usr/local/lib

23
contrib/mysql_to_pgsql/cmake/FindPostgreSQL.cmake
View file

@ -11,24 +11,9 @@ IF (PGSQL_INCLUDE_DIR)
SET(PostgreSQL_FIND_QUIETLY TRUE) SET(PostgreSQL_FIND_QUIETLY TRUE)
ENDIF (PGSQL_INCLUDE_DIR) ENDIF (PGSQL_INCLUDE_DIR)
# the registry settings checked are in order:
# - for pgInstaller 8.2.x postgresql version
# - for pgInstaller 8.3.x postgresql version
SET(PGSQL_WIN_BASE
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\PostgreSQL\\Installations\\{B823632F-3B72-4514-8861-B961CE263224};Base Directory]"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\PostgreSQL\\Installations\\{1F701DBD-1660-4108-B10A-FB435EA63BF0};Base Directory]")
IF(PGSQL_WIN_BASE)
IF(MSVC)
SET(PGSQL_SEARCH_LIB_PATHS "${PGSQL_WIN_BASE}/lib/ms")
ELSE(MSVC)
SET(PGSQL_SEARCH_LIB_PATHS "${PGSQL_WIN_BASE}/lib")
ENDIF(MSVC)
ENDIF(PGSQL_WIN_BASE)
FIND_PATH(PGSQL_INCLUDE_DIR libpq-fe.h FIND_PATH(PGSQL_INCLUDE_DIR libpq-fe.h
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\PostgreSQL\\Installations\\{1F701DBD-1660-4108-B10A-FB435EA63BF0};Base Directory]/include" $ENV{ProgramFiles}/PostgreSQL/*/include
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\PostgreSQL\\Installations\\{B823632F-3B72-4514-8861-B961CE263224};Base Directory]/include" $ENV{SystemDrive}/PostgreSQL/*/include
/usr/local/pgsql/include /usr/local/pgsql/include
/usr/local/postgresql/include /usr/local/postgresql/include
/usr/local/include/pgsql /usr/local/include/pgsql
@ -44,8 +29,8 @@ FIND_PATH(PGSQL_INCLUDE_DIR libpq-fe.h
SET(PGSQL_NAMES pq libpq) SET(PGSQL_NAMES pq libpq)
SET(PGSQL_SEARCH_LIB_PATHS SET(PGSQL_SEARCH_LIB_PATHS
${PGSQL_SEARCH_LIB_PATHS} ${PGSQL_SEARCH_LIB_PATHS}
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\PostgreSQL\\Installations\\{1F701DBD-1660-4108-B10A-FB435EA63BF0};Base Directory]/lib" $ENV{ProgramFiles}/PostgreSQL/*/lib
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\PostgreSQL\\Installations\\{B823632F-3B72-4514-8861-B961CE263224};Base Directory]/lib" $ENV{SystemDrive}/PostgreSQL/*/lib
/usr/local/pgsql/lib /usr/local/pgsql/lib
/usr/local/lib /usr/local/lib
/usr/lib /usr/lib

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "9394" #define REVISION_NR "9395"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__