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

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

Revision: 60874
          http://sourceforge.net/p/firebird/code/60874
Author:   egorpugin
Date:     2015-03-08 13:20:06 +0000 (Sun, 08 Mar 2015)
Log Message:
-----------
[build] [cmake] Fix OS X build.

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

Modified: firebird/trunk/CMakeLists.txt
===================================================================
--- firebird/trunk/CMakeLists.txt	2015-03-08 13:19:50 UTC (rev 60873)
+++ firebird/trunk/CMakeLists.txt	2015-03-08 13:20:06 UTC (rev 60874)
@@ -220,7 +220,7 @@
     set(LIB_iconv iconv)
 endif()
 
-if (FREEBSD)
+if (FREEBSD OR APPLE)
     include_directories(/usr/local/include)
     link_directories(/usr/local/lib)
 endif()

Modified: firebird/trunk/src/CMakeLists.txt
===================================================================
--- firebird/trunk/src/CMakeLists.txt	2015-03-08 13:19:50 UTC (rev 60873)
+++ firebird/trunk/src/CMakeLists.txt	2015-03-08 13:20:06 UTC (rev 60874)
@@ -617,7 +617,7 @@
 if (NOT CMAKE_CROSSCOMPILING)
 
 add_executable              (gpre_boot ${gpre_boot_src} ${VERSION_RC})
-target_link_libraries       (gpre_boot gpre_common common ${LIB_Ws2_32})
+target_link_libraries       (gpre_boot gpre_common common ${LIB_iconv} ${LIB_Ws2_32})
 set_output_directory        (gpre_boot . CURRENT_DIR)
 project_group               (gpre_boot Boot)
 

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