r15431 by craig - More fixes for #9322

[scribus-commit]

Author: craig
Date: Thu Aug 19 18:07:45 2010
New Revision: 15431

URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=15431
Log:
More fixes for #9322

Modified:
    trunk/Scribus/scribus/CMakeLists.txt
    trunk/Scribus/scribus/plugins/scriptplugin/objprinter.cpp

Modified: trunk/Scribus/scribus/CMakeLists.txt
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15431&path=/trunk/Scribus/scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/CMakeLists.txt Thu Aug 19 18:07:45 2010
@@ -956,13 +956,13 @@
 ENDIF(WIN32)
 
 ##TEST FIX FOR 6897
-IF (GCC AND NOT WIN32)
+IF ((GCC AND NOT WIN32) OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
 # Use the -E / --export-dynamic flag to ensure that symbols in the Scribus
 # binary are in the public symbol table for plugins. The symbols must also
 # be set as SCRIBUS_API if we're building with -fvisibility=hidden .
 # Should fix bug 6897 .
-     SET_TARGET_PROPERTIES(${EXE_NAME} PROPERTIES LINK_FLAGS -Wl,-E)
- ENDIF (GCC AND NOT WIN32)
+  SET_TARGET_PROPERTIES(${EXE_NAME} PROPERTIES LINK_FLAGS -Wl,-E)
+ENDIF ((GCC AND NOT WIN32) OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
 ##
 
 
@@ -1008,7 +1008,7 @@
 
 # #9311 for the OpenBSD addition
 IF(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD" OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-  TARGET_LINK_LIBRARIES(${EXE_NAME} util)
+  TARGET_LINK_LIBRARIES(${EXE_NAME} util execinfo)
 ENDIF(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD" OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
 
 IF(WIN32)

Modified: trunk/Scribus/scribus/plugins/scriptplugin/objprinter.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15431&path=/trunk/Scribus/scribus/plugins/scriptplugin/objprinter.cpp
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/objprinter.cpp (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/objprinter.cpp Thu Aug 19 18:07:45 2010
@@ -5,6 +5,7 @@
 for which a new license (GPL+exception) is in place.
 */
 #include <vector>
+#include <iostream>
 
 #include "objprinter.h"
 #include "cmdutil.h"