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

[greg.hellings at crosswire.org]

Author: greg.hellings
Date: 2011-07-07 12:28:44 -0700 (Thu, 07 Jul 2011)
New Revision: 2635

Modified:
   trunk/cmake/FindICU.cmake
   trunk/cmake/toolchains/Toolchain-mingw32.cmake
Log:
Merge branch 'fix-icu'
Fixes some problems with ICU detection in cross-compile.

Conflicts:
	cmake/toolchains/Toolchain-mingw32.cmake

Modified: trunk/cmake/FindICU.cmake
===================================================================
--- trunk/cmake/FindICU.cmake	2011-07-07 19:28:34 UTC (rev 2634)
+++ trunk/cmake/FindICU.cmake	2011-07-07 19:28:44 UTC (rev 2635)
@@ -13,6 +13,7 @@
 find_program(
   ICU_CONFIG_BIN
   icu-config
+  HINTS "${ICU_CONFIG_BIN_PATH}"
 )
 find_program(
      ICU_GENRB
@@ -24,7 +25,7 @@
   MESSAGE(STATUS "[ICU] genrb: Yes ${ICU_GENRB}")
 
   # Get include directories
-  execute_process(COMMAND "${ICU_CONFIG_BIN}" "--cppflags"
+  execute_process(COMMAND "${ICU_CONFIG_BIN}" "--noverify" "--cppflags"
     OUTPUT_VARIABLE ICU_INCLUDE_DIR
     OUTPUT_STRIP_TRAILING_WHITESPACE
   )
@@ -33,12 +34,12 @@
   string(REGEX REPLACE "^[ 	]+" "" ICU_INCLUDE_DIR ${ICU_INCLUDE_DIR})
 
      # Try to get the Libraries we need
-  execute_process(COMMAND "${ICU_CONFIG_BIN}" "--ldflags"
+  execute_process(COMMAND "${ICU_CONFIG_BIN}" "--noverify" "--ldflags"
     OUTPUT_VARIABLE ICU_LIBRARY_RAW
     OUTPUT_STRIP_TRAILING_WHITESPACE
   )
   
-  execute_process(COMMAND "${ICU_CONFIG_BIN}" "--ldflags-icuio"
+  execute_process(COMMAND "${ICU_CONFIG_BIN}" "--noverify" "--ldflags-icuio"
      OUTPUT_VARIABLE ICU_LIBRARY_IO_RAW
      OUTPUT_STRIP_TRAILING_WHITESPACE
   )
@@ -49,7 +50,7 @@
      set(ICU_LIBRARY "${ICU_LIBRARY} ${ICU_LIBRARY_IO_RAW}")
      
      # Get the version
-     execute_process(COMMAND "${ICU_CONFIG_BIN}" "--version"
+     execute_process(COMMAND "${ICU_CONFIG_BIN}" "--noverify" "--version"
 	  OUTPUT_VARIABLE ICU_VERSION
 	  OUTPUT_STRIP_TRAILING_WHITESPACE
      )

Modified: trunk/cmake/toolchains/Toolchain-mingw32.cmake
===================================================================
--- trunk/cmake/toolchains/Toolchain-mingw32.cmake	2011-07-07 19:28:34 UTC (rev 2634)
+++ trunk/cmake/toolchains/Toolchain-mingw32.cmake	2011-07-07 19:28:44 UTC (rev 2635)
@@ -1,3 +1,8 @@
+<<<<<<< HEAD
+=======
+SET(MINGW32_ROOT "/usr/i686-pc-mingw32/sys-root/mingw")
+
+>>>>>>> fix-icu
 SET(CMAKE_SYSTEM_NAME Windows)
 
 # specify the cross compiler
@@ -5,7 +10,11 @@
 SET(CMAKE_CXX_COMPILER /usr/bin/i686-pc-mingw32-g++)
 
 # where is the target environment
+<<<<<<< HEAD
 SET(CMAKE_FIND_ROOT_PATH /usr/i686-pc-mingw32/sys-root/mingw /usr/local/i686-pc-mingw32)
+=======
+SET(CMAKE_FIND_ROOT_PATH "${MINGW32_ROOT}" /usr/local/i686-pc-mingw32)
+>>>>>>> fix-icu
 
 # search for programs in the build host directories
 SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
@@ -23,3 +32,12 @@
 
 # override boost library suffix which defaults to -mgw
 SET(Boost_COMPILER -gcc45)
+<<<<<<< HEAD
+=======
+
+# Since ICU is all strange and smart and stuff, let's do this
+SET(ICU_CONFIG_BIN_PATH "${MINGW32_ROOT}/bin/")
+
+INCLUDE_DIRECTORIES("${MINGW32_ROOT}/include/glib-2.0")
+INCLUDE_DIRECTORIES("${MINGW32_ROOT}/lib/glib-2.0/include")
+>>>>>>> fix-icu