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

[greg.hellings at crosswire.org]

Author: greg.hellings
Date: 2011-07-10 18:30:52 -0700 (Sun, 10 Jul 2011)
New Revision: 2639

Modified:
   trunk/cmake/FindICU.cmake
   trunk/cmake/toolchains/Toolchain-mingw32.cmake
Log:
Fixing execution options of icu-config

Modified: trunk/cmake/FindICU.cmake
===================================================================
--- trunk/cmake/FindICU.cmake	2011-07-10 10:16:37 UTC (rev 2638)
+++ trunk/cmake/FindICU.cmake	2011-07-11 01:30:52 UTC (rev 2639)
@@ -25,7 +25,7 @@
   MESSAGE(STATUS "[ICU] genrb: Yes ${ICU_GENRB}")
 
   # Get include directories
-  execute_process(COMMAND "${ICU_CONFIG_BIN}" "--noverify" "--cppflags"
+  execute_process(COMMAND "${ICU_CONFIG_BIN}" ${ICU_CONFIG_OPTS} "--cppflags"
     OUTPUT_VARIABLE ICU_INCLUDE_DIR
     OUTPUT_STRIP_TRAILING_WHITESPACE
   )
@@ -34,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}" "--noverify" "--ldflags"
+  execute_process(COMMAND "${ICU_CONFIG_BIN}" ${ICU_CONFIG_OPTS} "--ldflags"
     OUTPUT_VARIABLE ICU_LIBRARY_RAW
     OUTPUT_STRIP_TRAILING_WHITESPACE
   )
   
-  execute_process(COMMAND "${ICU_CONFIG_BIN}" "--noverify" "--ldflags-icuio"
+  execute_process(COMMAND "${ICU_CONFIG_BIN}" ${ICU_CONFIG_OPTS} "--ldflags-icuio"
      OUTPUT_VARIABLE ICU_LIBRARY_IO_RAW
      OUTPUT_STRIP_TRAILING_WHITESPACE
   )
@@ -50,7 +50,7 @@
      set(ICU_LIBRARY "${ICU_LIBRARY} ${ICU_LIBRARY_IO_RAW}")
      
      # Get the version
-     execute_process(COMMAND "${ICU_CONFIG_BIN}" "--noverify" "--version"
+     execute_process(COMMAND "${ICU_CONFIG_BIN}" ${ICU_CONFIG_OPTS} "--version"
 	  OUTPUT_VARIABLE ICU_VERSION
 	  OUTPUT_STRIP_TRAILING_WHITESPACE
      )

Modified: trunk/cmake/toolchains/Toolchain-mingw32.cmake
===================================================================
--- trunk/cmake/toolchains/Toolchain-mingw32.cmake	2011-07-10 10:16:37 UTC (rev 2638)
+++ trunk/cmake/toolchains/Toolchain-mingw32.cmake	2011-07-11 01:30:52 UTC (rev 2639)
@@ -28,6 +28,7 @@
 
 # Since ICU is all strange and smart and stuff, let's do this
 SET(ICU_CONFIG_BIN_PATH "${MINGW32_ROOT}/bin/")
+SET(ICU_CONFIG_OPTS "--noverify")
 
 INCLUDE_DIRECTORIES("${MINGW32_ROOT}/include/glib-2.0")
 INCLUDE_DIRECTORIES("${MINGW32_ROOT}/lib/glib-2.0/include")