r14406 by cbradney - #8605: Add -fPIC for ARCH_X86_64 to lib2geom and wpg importer

scribus-commit scribus-commit at lists.scribus.net
Sun Dec 13 23:35:30 CET 2009


Revision: 14406
Author: cbradney
Date: 2009-12-13T11:25:32.698524Z
Commit message: #8605: Add -fPIC for ARCH_X86_64 to lib2geom and wpg importer

Changeset: 
M  /trunk/Scribus/scribus/plugins/import/wpg/wpg/CMakeLists.txt
M  /trunk/Scribus/scribus/plugins/tools/2geomtools/lib2geom/CMakeLists.txt

Diffs:
Index: scribus/plugins/tools/2geomtools/lib2geom/CMakeLists.txt
===================================================================
--- scribus/plugins/tools/2geomtools/lib2geom/CMakeLists.txt	(revision 14405)
+++ scribus/plugins/tools/2geomtools/lib2geom/CMakeLists.txt	(revision 14406)
@@ -15,6 +15,9 @@
 #CB SET(CMAKE_CXX_FLAGS "-Wall")
 #CB SET(CMAKE_MAKE_PROGRAM "${CMAKE_MAKE_PROGRAM}")
 # We need to pass -fPIC only to lib2geom on amd64 - avoid it elsewhere see: http://www.gentoo.org/proj/en/base/amd64/howtos/index.xml?part=1&chap=3
+IF (ARCH_X86_64 EQUAL 1)
+  SET(CMAKE_CXX_FLAGS "$(CMAKE_CXX_FLAGS) -fPIC")
+ENDIF (ARCH_X86_64 EQUAL 1)
 
 OPTION(2GEOM_BUILD_SHARED
   "Build lib2geom and libtoy as shared libraries."
@@ -112,4 +115,4 @@
 #CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/2geom.pc.in
 #                ${CMAKE_BINARY_DIR}/2geom.pc @ONLY IMMEDIATE )
 #INSTALL(FILES "${CMAKE_BINARY_DIR}/2geom.pc" DESTINATION lib/pkgconfig)
-#
\ No newline at end of file
+#
Index: scribus/plugins/import/wpg/wpg/CMakeLists.txt
===================================================================
--- scribus/plugins/import/wpg/wpg/CMakeLists.txt	(revision 14405)
+++ scribus/plugins/import/wpg/wpg/CMakeLists.txt	(revision 14406)
@@ -1,4 +1,7 @@
 SET(LIB_TYPE STATIC)
+IF (ARCH_X86_64 EQUAL 1)
+  SET(CMAKE_CXX_FLAGS "$(CMAKE_CXX_FLAGS) -fPIC")
+ENDIF (ARCH_X86_64 EQUAL 1)
 SET(WPG_SOURCES
     WPG1Parser.cpp
     WPG2Parser.cpp




More information about the scribus-commit mailing list