diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2013-09-23 21:45:55 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2013-09-23 21:45:55 +0000 |
| commit | d456079b7e928007d4130ffb4ab5ccf49c98481e (patch) | |
| tree | dba40805065d07057c21b5b77dbb76ec1419bd05 /cmake/modules/FindGEOIP.cmake | |
| parent | d74564d6cf9d5e5d5927b51d31220db1c51409e7 (diff) | |
Beginnings of win cmake support (not yet working), created by Graham Bloice,
some smaller changes by me.
- README.cmake
Document how to (one day) run on Windows
- CMakeLists.txt
Use MSVC compiler flags for MSVC instead of gcc flags
- FindWSWinLibs.cmake
New: Creates HINTS for finding includes and libraries
inside the Wireshark support library installation.
- FindXXX.cmake
Make use of HINTS generated by FindWSWinLibs.cmake
This has not really been tested on Windows as my installation seems to have
automagically downloaded some fixes and is in an inconsistent state since.
Will probably need to reinstall.
svn path=/trunk/; revision=52194
Diffstat (limited to 'cmake/modules/FindGEOIP.cmake')
| -rw-r--r-- | cmake/modules/FindGEOIP.cmake | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/cmake/modules/FindGEOIP.cmake b/cmake/modules/FindGEOIP.cmake index 09a763ea23..bfd4c933f4 100644 --- a/cmake/modules/FindGEOIP.cmake +++ b/cmake/modules/FindGEOIP.cmake @@ -14,10 +14,13 @@ IF (GEOIP_INCLUDE_DIRS) SET(GEOIP_FIND_QUIETLY TRUE) ENDIF (GEOIP_INCLUDE_DIRS) -FIND_PATH(GEOIP_INCLUDE_DIR GeoIP.h) +INCLUDE(FindWSWinLibs) +FindWSWinLibs("GeoIP-.*" "GEOIP_HINTS") -SET(GEOIP_NAMES GeoIP) -FIND_LIBRARY(GEOIP_LIBRARY NAMES ${GEOIP_NAMES} ) +FIND_PATH(GEOIP_INCLUDE_DIR GeoIP.h HINTS "${GEOIP_HINTS}/include" ) + +SET(GEOIP_NAMES GeoIP libGeoIP-1) +FIND_LIBRARY(GEOIP_LIBRARY NAMES ${GEOIP_NAMES} HINTS "${GEOIP_HINTS}/lib" ) # handle the QUIETLY and REQUIRED arguments and set GEOIP_FOUND to TRUE if # all listed variables are TRUE |