[sword-svn] r2641 - in trunk: . cmake cmake/toolchains

[greg.hellings at crosswire.org]

Author: greg.hellings
Date: 2011-07-11 06:25:55 -0700 (Mon, 11 Jul 2011)
New Revision: 2641

Modified:
   trunk/CMakeLists.txt
   trunk/cmake/FindRegex.cmake
   trunk/cmake/toolchains/Toolchain-mingw32.cmake
Log:
Windows needs a Regex library

Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2011-07-11 01:31:03 UTC (rev 2640)
+++ trunk/CMakeLists.txt	2011-07-11 13:25:55 UTC (rev 2641)
@@ -174,6 +174,9 @@
 	INCLUDE_DIRECTORIES(${ICU_INCLUDE_DIRS})
 	SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${ICU_LIBRARIES} ${ICU_I18N_LIBRARIES})
 ENDIF(WITH_ICU)
+IF(REGEX_FOUND AND CROSS_COMPILE_MINGW32)
+	SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${REGEX_LIBRARY})
+ENDIF(REGEX_FOUND AND CROSS_COMPILE_MINGW32)
 
 IF(BUILDING_SHARED)
 	TARGET_LINK_LIBRARIES(sword ${SWORD_LINK_LIBRARIES})

Modified: trunk/cmake/FindRegex.cmake
===================================================================
--- trunk/cmake/FindRegex.cmake	2011-07-11 01:31:03 UTC (rev 2640)
+++ trunk/cmake/FindRegex.cmake	2011-07-11 13:25:55 UTC (rev 2641)
@@ -27,6 +27,9 @@
 		 )
 ENDIF(NOT REGEX_INCLUDE_DIR)
 
+FIND_LIBRARY(REGEX_LIBRARY
+	NAMES regex gnurx)
+
 IF(REGEX_INCLUDE_DIR)
 	SET(REGEX_FOUND 1)
 	MESSAGE(STATUS "System regex.h: Yes")

Modified: trunk/cmake/toolchains/Toolchain-mingw32.cmake
===================================================================
--- trunk/cmake/toolchains/Toolchain-mingw32.cmake	2011-07-11 01:31:03 UTC (rev 2640)
+++ trunk/cmake/toolchains/Toolchain-mingw32.cmake	2011-07-11 13:25:55 UTC (rev 2641)
@@ -32,3 +32,5 @@
 
 INCLUDE_DIRECTORIES("${MINGW32_ROOT}/include/glib-2.0")
 INCLUDE_DIRECTORIES("${MINGW32_ROOT}/lib/glib-2.0/include")
+
+SET(CROSS_COMPILE_MINGW32 TRUE)