[Firebird-checkins] SF.net SVN: firebird:[60564] firebird/trunk

[<ego...@us...>]

Revision: 60564
          http://sourceforge.net/p/firebird/code/60564
Author:   egorpugin
Date:     2015-01-26 19:20:48 +0000 (Mon, 26 Jan 2015)
Log Message:
-----------
[build] [cmake] Fix crosscompiling for android on linux.

Modified Paths:
--------------
    firebird/trunk/CMakeLists.txt
    firebird/trunk/examples/CMakeLists.txt
    firebird/trunk/src/CMakeLists.txt
    firebird/trunk/src/utilities/CMakeLists.txt

Modified: firebird/trunk/CMakeLists.txt
===================================================================
--- firebird/trunk/CMakeLists.txt	2015-01-26 15:23:27 UTC (rev 60563)
+++ firebird/trunk/CMakeLists.txt	2015-01-26 19:20:48 UTC (rev 60564)
@@ -122,6 +122,24 @@
 endif()
 
 if (UNIX)
+    if (CMAKE_CROSSCOMPILING)
+        find_path(ICU_INCLUDE_DIR unicode/ucnv.h
+            PATHS
+                /usr/include
+                /usr/include/x86_64-linux-gnu
+                /usr/local/include
+                /opt/local/include
+            CMAKE_FIND_ROOT_PATH_BOTH
+        )
+        if (ICU_INCLUDE_DIR)
+            execute_process(COMMAND ${CMAKE_COMMAND} -E copy_directory
+                ${ICU_INCLUDE_DIR}/unicode
+                ${CMAKE_BINARY_DIR}/unicode
+            )
+            include_directories(${CMAKE_BINARY_DIR})
+        endif()
+    endif()
+
     set(OS_DIR posix)
 
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")

Modified: firebird/trunk/examples/CMakeLists.txt
===================================================================
--- firebird/trunk/examples/CMakeLists.txt	2015-01-26 15:23:27 UTC (rev 60563)
+++ firebird/trunk/examples/CMakeLists.txt	2015-01-26 19:20:48 UTC (rev 60564)
@@ -34,7 +34,7 @@
 add_executable          (empbuild empbuild.c empbuild.fdb ${CMAKE_CURRENT_SOURCE_DIR}/empbuild/empbuild.e)
 target_link_libraries   (empbuild yvalve)
 set_output_directory    (empbuild . FORCE)
-add_dependencies        (empbuild gfix engine12 fbtrace)
+add_dependencies_cc     (empbuild gfix engine12 fbtrace)
 project_group           (empbuild Examples)
 
 file(GLOB files

Modified: firebird/trunk/src/CMakeLists.txt
===================================================================
--- firebird/trunk/src/CMakeLists.txt	2015-01-26 15:23:27 UTC (rev 60563)
+++ firebird/trunk/src/CMakeLists.txt	2015-01-26 19:20:48 UTC (rev 60564)
@@ -504,7 +504,7 @@
 add_library                 (udr_engine SHARED ${udr_engine_src} ${VERSION_RC})
 target_link_libraries       (udr_engine common yvalve)
 set_output_directory        (udr_engine plugins)
-set_exported_symbols        (udr_engine plugin)
+set_exported_symbols        (udr_engine fbplugin)
 
 
 ########################################

Modified: firebird/trunk/src/utilities/CMakeLists.txt
===================================================================
--- firebird/trunk/src/utilities/CMakeLists.txt	2015-01-26 15:23:27 UTC (rev 60563)
+++ firebird/trunk/src/utilities/CMakeLists.txt	2015-01-26 19:20:48 UTC (rev 60564)
@@ -57,7 +57,7 @@
 
 add_library             (fbtrace SHARED ${fbtrace_src} ${fbtrace_os_src} ${fbtrace_include} ${VERSION_RC})
 target_link_libraries   (fbtrace common yvalve)
-add_dependencies        (fbtrace engine12 build_msg codes) # try to wait all generators stop
+add_dependencies_cc     (fbtrace engine12 build_msg codes) # try to wait all generators stop
 set_output_directory    (fbtrace plugins)
 set_exported_symbols    (fbtrace fbplugin)
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.