r15430 by craig - More fixes for #9322
scribus-commit
scribus-commit at lists.scribus.net
Thu Aug 19 20:06:30 CEST 2010
Author: craig
Date: Thu Aug 19 18:06:30 2010
New Revision: 15430
URL: http://scribus.info/websvn/listing.php?repname=Scribus&sc=1&rev=15430
Log:
More fixes for #9322
Modified:
branches/Version135/Scribus/scribus/CMakeLists.txt
branches/Version135/Scribus/scribus/plugins/scriptplugin/objprinter.cpp
Modified: branches/Version135/Scribus/scribus/CMakeLists.txt
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15430&path=/branches/Version135/Scribus/scribus/CMakeLists.txt
==============================================================================
--- branches/Version135/Scribus/scribus/CMakeLists.txt (original)
+++ branches/Version135/Scribus/scribus/CMakeLists.txt Thu Aug 19 18:06:30 2010
@@ -719,13 +719,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)
+ENDIF ((GCC AND NOT WIN32) OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
##
@@ -763,7 +763,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: branches/Version135/Scribus/scribus/plugins/scriptplugin/objprinter.cpp
URL: http://scribus.info/websvn/diff.php?repname=Scribus&rev=15430&path=/branches/Version135/Scribus/scribus/plugins/scriptplugin/objprinter.cpp
==============================================================================
--- branches/Version135/Scribus/scribus/plugins/scriptplugin/objprinter.cpp (original)
+++ branches/Version135/Scribus/scribus/plugins/scriptplugin/objprinter.cpp Thu Aug 19 18:06:30 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"
More information about the scribus-commit
mailing list