diff --git a/CMakeLists.txt b/CMakeLists.txt index 7980bcfd15..32055a040d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -122,6 +122,24 @@ if (MINGW) 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") diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 73cebfa8fd..672286cad9 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -34,7 +34,7 @@ add_custom_command( 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 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6acac4381e..8972c2fd1a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -504,7 +504,7 @@ set(udr_engine_src 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) ######################################## diff --git a/src/utilities/CMakeLists.txt b/src/utilities/CMakeLists.txt index b9a2646f40..e7418f1d61 100644 --- a/src/utilities/CMakeLists.txt +++ b/src/utilities/CMakeLists.txt @@ -57,7 +57,7 @@ file(GLOB fbtrace_include "ntrace/*.h") 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)