iSharkFly-Open
/
fis-gtm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: NONUTF8LOCALE and ICU versions above 4.8

This commit is contained in:
Amul Shah 2012-06-20 16:29:27 -04:00
parent 4657b4ff5a
commit a20641dcc0
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -391,6 +391,10 @@ file(GLOB mpt_files_sr_unix RELATIVE ${GTM_SOURCE_DIR}/sr_unix ${GTM_SOURCE_DIR}
set(gtm_chset_dir_ "") set(gtm_chset_dir_ "")
set(gtm_chset_dir_UTF-8 "/utf8") set(gtm_chset_dir_UTF-8 "/utf8")
set(gtm_chset_locale_ "C")
set(gtm_chset_locale_UTF-8 "en_US.utf8")
set(gtm_chset_all_locale_ "C")
set(gtm_chset_all_locale_UTF-8 "")
foreach(d sr_port sr_unix) foreach(d sr_port sr_unix)
foreach(m ${m_files_${d}}) foreach(m ${m_files_${d}})
@ -494,6 +498,12 @@ else()
message(FATAL_ERROR "Unable to find 'icu-config'. Set ICUCONFIG in CMake cache.") message(FATAL_ERROR "Unable to find 'icu-config'. Set ICUCONFIG in CMake cache.")
endif() endif()
if (gtm_icu_version GREATER 10)
message("libicu version ${gtm_icu_version} > 10")
string(REGEX REPLACE "([0-9])([0-9]).*" "\\1.\\2" gtm_icu_version "${gtm_icu_version}")
message("Fixing gtm_icu_version to ${gtm_icu_version}.\nThis had better be the default")
endif()
foreach(gtm_chset "" "UTF-8") foreach(gtm_chset "" "UTF-8")
foreach(in ${gtm_chset_routines_${gtm_chset}}) foreach(in ${gtm_chset_routines_${gtm_chset}})
string(REPLACE ".m" ".o" out "${in}") string(REPLACE ".m" ".o" out "${in}")
@ -506,6 +516,8 @@ foreach(gtm_chset "" "UTF-8")
-D gtmroutines=. -D gtmroutines=.
-D gtm_chset=${gtm_chset} -D gtm_chset=${gtm_chset}
-D gtm_icu_version=${gtm_icu_version} -D gtm_icu_version=${gtm_icu_version}
-D LC_CTYPE=${gtm_chset_locale_${gtm_chset}}
-D LC_ALL=${gtm_chset_all_locale_${gtm_chset}}
-D mumps=$<TARGET_FILE:mumps> -D mumps=$<TARGET_FILE:mumps>
-D "args=${in}" -D "args=${in}"
-P ${GTM_SOURCE_DIR}/sr_unix/mumps.cmake -P ${GTM_SOURCE_DIR}/sr_unix/mumps.cmake

2
sr_unix/mumps.cmake
View File

@ -13,6 +13,8 @@ foreach(v
gtmroutines gtmroutines
gtm_chset gtm_chset
gtm_icu_version gtm_icu_version
LC_CTYPE
LC_ALL
) )
if(DEFINED ${v}) if(DEFINED ${v})
set("ENV{${v}}" "${${v}}") set("ENV{${v}}" "${${v}}")