Browse Source

Merge pull request #9460 from xwang2713/HPCC-16814-lib2-icui18n

HPCC-16814 move icui18n ahead of cuuc and icudata

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 8 years ago
parent
commit
a3802aa742
1 changed files with 3 additions and 1 deletions
  1. 3 1
      cmake_modules/FindICU.cmake

+ 3 - 1
cmake_modules/FindICU.cmake

@@ -63,7 +63,9 @@ IF (NOT ICU_FOUND)
     ELSE()
       STRING(REPLACE "icuuc" "icuin" ICU_EXTRA1 "${ICU_LIBRARIES}")
     ENDIF()
-    set (ICU_LIBRARIES ${ICU_LIBRARIES} ${ICU_EXTRA1} ${ICU_EXTRA2} )
+    # The order is important for lib2 processing:
+    # depender, such as icuil8n, should be placed before the dependee
+    set (ICU_LIBRARIES ${ICU_EXTRA1} ${ICU_LIBRARIES} ${ICU_EXTRA2} )
   ENDIF()