diff options
| author | flaviojs <flaviojs@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-07-12 22:01:45 +0000 |
|---|---|---|
| committer | flaviojs <flaviojs@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-07-12 22:01:45 +0000 |
| commit | a0383842abeb49c65c05832b51161dfaecc67fcb (patch) | |
| tree | 489e6049329c2faa8e53d778abdd34369dd84a5a /3rdparty/cmake | |
| parent | 9349df4e5fa122fd74d632d4227f8c1a1f32c36d (diff) | |
| download | hercules-a0383842abeb49c65c05832b51161dfaecc67fcb.tar.gz hercules-a0383842abeb49c65c05832b51161dfaecc67fcb.tar.bz2 hercules-a0383842abeb49c65c05832b51161dfaecc67fcb.tar.xz hercules-a0383842abeb49c65c05832b51161dfaecc67fcb.zip | |
* CMake: added search for math.h, added search for socket/nsl library. (tested with Solaris-201011-x86)
* Added missing include to socket.c.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14903 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to '3rdparty/cmake')
| -rw-r--r-- | 3rdparty/cmake/FindMYSQL.cmake | 2 | ||||
| -rw-r--r-- | 3rdparty/cmake/FindPCRE.cmake | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/3rdparty/cmake/FindMYSQL.cmake b/3rdparty/cmake/FindMYSQL.cmake index 0a07f3612..c18e8d637 100644 --- a/3rdparty/cmake/FindMYSQL.cmake +++ b/3rdparty/cmake/FindMYSQL.cmake @@ -10,6 +10,7 @@ find_path( MYSQL_INCLUDE_DIRS "mysql.h" PATHS "/usr/include/mysql" "/usr/local/include/mysql" + "/usr/mysql/include/mysql" "$ENV{PROGRAMFILES}/MySQL/*/include" "$ENV{SYSTEMDRIVE}/MySQL/*/include" ) @@ -18,6 +19,7 @@ find_library( MYSQL_LIBRARIES PATHS "/usr/lib/mysql" "/usr/local/lib/mysql" + "/usr/mysql/lib/mysql" "$ENV{PROGRAMFILES}/MySQL/*/lib" "$ENV{SYSTEMDRIVE}/MySQL/*/lib" ) mark_as_advanced( MYSQL_LIBRARIES MYSQL_INCLUDE_DIRS ) diff --git a/3rdparty/cmake/FindPCRE.cmake b/3rdparty/cmake/FindPCRE.cmake index cb4d9177b..2215451d1 100644 --- a/3rdparty/cmake/FindPCRE.cmake +++ b/3rdparty/cmake/FindPCRE.cmake @@ -6,8 +6,9 @@ # PCRE_FOUND - True if pcre found. -find_path( PCRE_INCLUDE_DIR pcre.h ) - +find_path( PCRE_INCLUDE_DIR pcre.h + PATHS + "/usr/include/pcre" ) set( PCRE_NAMES pcre ) find_library( PCRE_LIBRARY NAMES ${PCRE_NAMES} ) mark_as_advanced( PCRE_LIBRARY PCRE_INCLUDE_DIR ) |