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

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

Revision: 62053
          http://sourceforge.net/p/firebird/code/62053
Author:   egorpugin
Date:     2015-07-28 16:40:25 +0000 (Tue, 28 Jul 2015)
Log Message:
-----------
[build][cmake] Fix OS X build with brew.

Modified Paths:
--------------
    firebird/trunk/CMakeLists.txt
    firebird/trunk/builds/cmake/Configure.cmake

Modified: firebird/trunk/CMakeLists.txt
===================================================================
--- firebird/trunk/CMakeLists.txt	2015-07-28 15:56:58 UTC (rev 62052)
+++ firebird/trunk/CMakeLists.txt	2015-07-28 16:40:25 UTC (rev 62053)
@@ -121,6 +121,7 @@
                 /usr/include/x86_64-linux-gnu
                 /usr/local/include
                 /opt/local/include
+                /usr/local/opt/icu4c/include
             CMAKE_FIND_ROOT_PATH_BOTH
         )
         if ("${ICU_INCLUDE_DIR}" STREQUAL "ICU_INCLUDE_DIR-NOTFOUND")
@@ -236,6 +237,7 @@
     if (NOT CMAKE_CROSSCOMPILING)
         include_directories(/opt/local/include)
         link_directories(/opt/local/lib)
+        link_directories(/usr/local/opt/icu4c/lib)
     endif()
 
     find_library(LIB_CoreFoundation CoreFoundation)

Modified: firebird/trunk/builds/cmake/Configure.cmake
===================================================================
--- firebird/trunk/builds/cmake/Configure.cmake	2015-07-28 15:56:58 UTC (rev 62052)
+++ firebird/trunk/builds/cmake/Configure.cmake	2015-07-28 16:40:25 UTC (rev 62053)
@@ -245,6 +245,10 @@
 )
 check_functions(functions_list)
 
+if (APPLE)
+    set(HAVE_QSORT_R 0 CACHE STRING "Disabled on OS X" FORCE)
+endif()
+
 check_cxx_source_compiles("#include <unistd.h>\nmain(){fdatasync(0);}" HAVE_FDATASYNC)
 
 check_library_exists(dl dladdr "${CMAKE_LIBRARY_PREFIX}" HAVE_DLADDR)

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