r17899 by jghali - #11202: Incorrect variable expansion in CMakeLists

scribus-commit scribus-commit at lists.scribus.net
Fri Nov 23 11:59:03 UTC 2012


Author: jghali
Date: Fri Nov 23 11:59:03 2012
New Revision: 17899

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17899
Log:
#11202: Incorrect variable expansion in CMakeLists

Modified:
    trunk/Scribus/scribus/third_party/cairo/CMakeLists.txt
    trunk/Scribus/scribus/third_party/lib2geom/CMakeLists.txt
    trunk/Scribus/scribus/third_party/wpg/CMakeLists.txt

Modified: trunk/Scribus/scribus/third_party/cairo/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17899&path=/trunk/Scribus/scribus/third_party/cairo/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/third_party/cairo/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/third_party/cairo/CMakeLists.txt Fri Nov 23 11:59:03 2012
@@ -1,109 +1,109 @@
-pkg_check_modules(PIXMAN   pixman-1>=0.15.16)
-
-IF (NOT PIXMAN_FOUND)
-   MESSAGE(FATAL_ERROR "Pixman >= 0.15.16 is required")
-ENDIF (NOT PIXMAN_FOUND)
-
-INCLUDE_DIRECTORIES(
-${CMAKE_SOURCE_DIR}
-${CMAKE_SOURCE_DIR}/scribus
-${FREETYPE_INCLUDE_DIRS}
-${FONTCONFIG_INCLUDE_DIR}
-${PIXMAN_INCLUDE_DIRS}
-)
-# 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)
-
-SET(SCRIBUS_CAIRO_LIB_SOURCES
-cairo-analysis-surface.c
-cairo-arc.c
-cairo-array.c
-cairo-atomic.c
-cairo-bentley-ottmann.c
-cairo-bentley-ottmann-rectangular.c
-cairo-bentley-ottmann-rectilinear.c
-cairo.c
-cairo-cache.c
-cairo-clip.c
-cairo-color.c
-cairo-debug.c
-cairo-fixed.c
-cairo-font-face.c
-cairo-font-face-twin.c
-cairo-font-face-twin-data.c
-cairo-font-options.c
-cairo-freelist.c
-cairo-ft-font.c
-cairo-gstate.c
-cairo-hash.c
-cairo-hull.c
-cairo-image-info.c
-cairo-image-surface.c
-cairo-matrix.c
-cairo-mesh-gradient-rasterizer.c
-cairo-meta-surface.c
-cairo-misc.c
-cairo-mutex.c
-cairo-output-stream.c
-cairo-paginated-surface.c
-cairo-path-bounds.c
-cairo-path.c
-cairo-path-fill.c
-cairo-path-fixed.c
-cairo-path-in-fill.c
-cairo-path-stroke.c
-cairo-pattern.c
-cairo-pen.c
-cairo-png.c
-cairo-polygon.c
-cairo-rectangle.c
-cairo-region.c
-cairo-rtree.c
-cairo-scaled-font.c
-cairo-slope.c
-cairo-spans.c
-cairo-spline.c
-cairo-stroke-style.c
-cairo-surface.c
-cairo-surface-clipper.c
-cairo-surface-fallback.c
-cairo-surface-wrapper.c
-cairo-system.c
-cairo-tee-surface.c
-cairo-tor-scan-converter.c
-cairo-toy-font-face.c
-cairo-traps.c
-cairo-unicode.c
-cairo-user-font.c
-cairo-version.c
-cairo-wideint.c
-)
-
-IF (WIN32)
-  SET(CAIRO_WIN32_ONLY_SOURCES
-      cairo-win32-font.c
-      cairo-win32-printing-surface.c
-	  cairo-win32-surface.c
-      cairo-scaled-font-subsets.c
-	  cairo-truetype-subset.c
-     )
-ELSE(WIN32)
-  SET(CAIRO_WIN32_ONLY_SOURCES)
-ENDIF(WIN32)
-
-
-ADD_DEFINITIONS(-DHAVE_STDINT_H  -DHAVE_UINT64_T=1 -DCAIRO_NO_MUTEX=1)
-
-SET(SCRIBUS_CAIRO_LIB "scribus_cairo_lib")
-ADD_LIBRARY(${SCRIBUS_CAIRO_LIB} STATIC ${SCRIBUS_CAIRO_LIB_SOURCES} ${CAIRO_WIN32_ONLY_SOURCES})
-
-# This is a convenience library that for linkage purposes is part of Scribus's
-# main API.
-SET_TARGET_PROPERTIES(${SCRIBUS_CAIRO_LIB}
-  PROPERTIES
-  COMPILE_FLAGS -DCOMPILE_SCRIBUS_MAIN_APP
-  )
-
-TARGET_LINK_LIBRARIES(${SCRIBUS_CAIRO_LIB} ${PIXMAN_LIBRARIES})
+pkg_check_modules(PIXMAN   pixman-1>=0.15.16)
+
+IF (NOT PIXMAN_FOUND)
+   MESSAGE(FATAL_ERROR "Pixman >= 0.15.16 is required")
+ENDIF (NOT PIXMAN_FOUND)
+
+INCLUDE_DIRECTORIES(
+${CMAKE_SOURCE_DIR}
+${CMAKE_SOURCE_DIR}/scribus
+${FREETYPE_INCLUDE_DIRS}
+${FONTCONFIG_INCLUDE_DIR}
+${PIXMAN_INCLUDE_DIRS}
+)
+# 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)
+
+SET(SCRIBUS_CAIRO_LIB_SOURCES
+cairo-analysis-surface.c
+cairo-arc.c
+cairo-array.c
+cairo-atomic.c
+cairo-bentley-ottmann.c
+cairo-bentley-ottmann-rectangular.c
+cairo-bentley-ottmann-rectilinear.c
+cairo.c
+cairo-cache.c
+cairo-clip.c
+cairo-color.c
+cairo-debug.c
+cairo-fixed.c
+cairo-font-face.c
+cairo-font-face-twin.c
+cairo-font-face-twin-data.c
+cairo-font-options.c
+cairo-freelist.c
+cairo-ft-font.c
+cairo-gstate.c
+cairo-hash.c
+cairo-hull.c
+cairo-image-info.c
+cairo-image-surface.c
+cairo-matrix.c
+cairo-mesh-gradient-rasterizer.c
+cairo-meta-surface.c
+cairo-misc.c
+cairo-mutex.c
+cairo-output-stream.c
+cairo-paginated-surface.c
+cairo-path-bounds.c
+cairo-path.c
+cairo-path-fill.c
+cairo-path-fixed.c
+cairo-path-in-fill.c
+cairo-path-stroke.c
+cairo-pattern.c
+cairo-pen.c
+cairo-png.c
+cairo-polygon.c
+cairo-rectangle.c
+cairo-region.c
+cairo-rtree.c
+cairo-scaled-font.c
+cairo-slope.c
+cairo-spans.c
+cairo-spline.c
+cairo-stroke-style.c
+cairo-surface.c
+cairo-surface-clipper.c
+cairo-surface-fallback.c
+cairo-surface-wrapper.c
+cairo-system.c
+cairo-tee-surface.c
+cairo-tor-scan-converter.c
+cairo-toy-font-face.c
+cairo-traps.c
+cairo-unicode.c
+cairo-user-font.c
+cairo-version.c
+cairo-wideint.c
+)
+
+IF (WIN32)
+  SET(CAIRO_WIN32_ONLY_SOURCES
+      cairo-win32-font.c
+      cairo-win32-printing-surface.c
+	  cairo-win32-surface.c
+      cairo-scaled-font-subsets.c
+	  cairo-truetype-subset.c
+     )
+ELSE(WIN32)
+  SET(CAIRO_WIN32_ONLY_SOURCES)
+ENDIF(WIN32)
+
+
+ADD_DEFINITIONS(-DHAVE_STDINT_H  -DHAVE_UINT64_T=1 -DCAIRO_NO_MUTEX=1)
+
+SET(SCRIBUS_CAIRO_LIB "scribus_cairo_lib")
+ADD_LIBRARY(${SCRIBUS_CAIRO_LIB} STATIC ${SCRIBUS_CAIRO_LIB_SOURCES} ${CAIRO_WIN32_ONLY_SOURCES})
+
+# This is a convenience library that for linkage purposes is part of Scribus's
+# main API.
+SET_TARGET_PROPERTIES(${SCRIBUS_CAIRO_LIB}
+  PROPERTIES
+  COMPILE_FLAGS -DCOMPILE_SCRIBUS_MAIN_APP
+  )
+
+TARGET_LINK_LIBRARIES(${SCRIBUS_CAIRO_LIB} ${PIXMAN_LIBRARIES})

Modified: trunk/Scribus/scribus/third_party/lib2geom/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17899&path=/trunk/Scribus/scribus/third_party/lib2geom/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/third_party/lib2geom/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/third_party/lib2geom/CMakeLists.txt Fri Nov 23 11:59:03 2012
@@ -1,102 +1,102 @@
-INCLUDE_DIRECTORIES(
-${CMAKE_SOURCE_DIR}
-${CMAKE_SOURCE_DIR}/scribus
-)
-
-SET(2GEOM_VERSION 0.1.0)
-
-# 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."
-  OFF)
-SET(LIB_TYPE STATIC)
-
-SET(2GEOM_SRC
-svg-path.h
-svg-path.cpp
-ord.h
-path.cpp
-path.h
-path-intersection.cpp
-path-intersection.h
-svg-elliptical-arc.h
-shape.cpp
-shape.h
-region.cpp
-region.h
-crossing.h
-crossing.cpp
-sweep.cpp
-sweep.h
-poly.cpp
-poly.h
-poly-dk-solve.cpp
-poly-dk-solve.h
-poly-laguerre-solve.cpp
-poly-laguerre-solve.h
-quadtree.cpp
-quadtree.h
-matrix.cpp
-matrix.h
-transforms.cpp
-transforms.h
-point.h
-point.cpp
-point-l.h
-coord.h
-d2.h
-d2-sbasis.h
-d2-sbasis.cpp
-rect.h
-piecewise.h
-piecewise.cpp
-sbasis.cpp
-sbasis.h
-sbasis-2d.h
-sbasis-2d.cpp
-sbasis-geometric.cpp
-sbasis-geometric.h
-sbasis-math.h
-sbasis-math.cpp
-sbasis-poly.cpp
-sbasis-poly.h
-sbasis-roots.cpp
-sbasis-to-bezier.cpp
-sbasis-to-bezier.h
-bezier-to-sbasis.h
-basic-intersection.h
-basic-intersection.cpp
-geom.cpp
-geom.h
-utils.h
-exception.h
-angle.h
-bezier-utils.cpp
-bezier-utils.h
-choose.h
-circulator.h
-conjugate_gradient.cpp
-conjugate_gradient.h
-convex-cover.cpp
-convex-cover.h
-solve-bezier-one-d.cpp
-solve-bezier-parametric.cpp
-solver.h
-sturm.h
-scribushelper.h
-scribushelper.cpp
-)
-
-SET(SCRIBUS_2GEOM_LIB "scribus_2geom_lib")
-ADD_LIBRARY(${SCRIBUS_2GEOM_LIB} STATIC ${2GEOM_SRC})
-
-# This is a convenience library that for linkage purposes is part of Scribus's
-# main API.
-SET_TARGET_PROPERTIES(${SCRIBUS_2GEOM_LIB}
-  PROPERTIES
-  COMPILE_FLAGS -DCOMPILE_SCRIBUS_MAIN_APP
-  )
+INCLUDE_DIRECTORIES(
+${CMAKE_SOURCE_DIR}
+${CMAKE_SOURCE_DIR}/scribus
+)
+
+SET(2GEOM_VERSION 0.1.0)
+
+# 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."
+  OFF)
+SET(LIB_TYPE STATIC)
+
+SET(2GEOM_SRC
+svg-path.h
+svg-path.cpp
+ord.h
+path.cpp
+path.h
+path-intersection.cpp
+path-intersection.h
+svg-elliptical-arc.h
+shape.cpp
+shape.h
+region.cpp
+region.h
+crossing.h
+crossing.cpp
+sweep.cpp
+sweep.h
+poly.cpp
+poly.h
+poly-dk-solve.cpp
+poly-dk-solve.h
+poly-laguerre-solve.cpp
+poly-laguerre-solve.h
+quadtree.cpp
+quadtree.h
+matrix.cpp
+matrix.h
+transforms.cpp
+transforms.h
+point.h
+point.cpp
+point-l.h
+coord.h
+d2.h
+d2-sbasis.h
+d2-sbasis.cpp
+rect.h
+piecewise.h
+piecewise.cpp
+sbasis.cpp
+sbasis.h
+sbasis-2d.h
+sbasis-2d.cpp
+sbasis-geometric.cpp
+sbasis-geometric.h
+sbasis-math.h
+sbasis-math.cpp
+sbasis-poly.cpp
+sbasis-poly.h
+sbasis-roots.cpp
+sbasis-to-bezier.cpp
+sbasis-to-bezier.h
+bezier-to-sbasis.h
+basic-intersection.h
+basic-intersection.cpp
+geom.cpp
+geom.h
+utils.h
+exception.h
+angle.h
+bezier-utils.cpp
+bezier-utils.h
+choose.h
+circulator.h
+conjugate_gradient.cpp
+conjugate_gradient.h
+convex-cover.cpp
+convex-cover.h
+solve-bezier-one-d.cpp
+solve-bezier-parametric.cpp
+solver.h
+sturm.h
+scribushelper.h
+scribushelper.cpp
+)
+
+SET(SCRIBUS_2GEOM_LIB "scribus_2geom_lib")
+ADD_LIBRARY(${SCRIBUS_2GEOM_LIB} STATIC ${2GEOM_SRC})
+
+# This is a convenience library that for linkage purposes is part of Scribus's
+# main API.
+SET_TARGET_PROPERTIES(${SCRIBUS_2GEOM_LIB}
+  PROPERTIES
+  COMPILE_FLAGS -DCOMPILE_SCRIBUS_MAIN_APP
+  )

Modified: trunk/Scribus/scribus/third_party/wpg/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17899&path=/trunk/Scribus/scribus/third_party/wpg/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/third_party/wpg/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/third_party/wpg/CMakeLists.txt Fri Nov 23 11:59:03 2012
@@ -1,38 +1,38 @@
-INCLUDE_DIRECTORIES(
-${CMAKE_SOURCE_DIR}
-${CMAKE_SOURCE_DIR}/scribus
-)
-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
-    WPGBinaryData.cpp
-    WPGBitmap.cpp
-    WPGBrush.cpp
-    WPGColor.cpp
-    WPGGradient.cpp
-    WPGHeader.cpp
-    WPGInternalStream.cpp
-    WPGOLEStream.cpp
-    WPGPath.cpp
-    WPGPen.cpp
-    WPGPoint.cpp
-    WPGraphics.cpp
-    WPGRect.cpp
-    WPGStreamImplementation.cpp
-    WPGString.cpp
-    WPGXParser.cpp
-  )
-
-SET(SCRIBUS_WPG_LIB "scribus_wpg_lib")
-ADD_LIBRARY(${SCRIBUS_WPG_LIB} STATIC ${WPG_SOURCES})
-
-# This is a convenience library that for linkage purposes is part of Scribus's
-# main API.
-SET_TARGET_PROPERTIES(${SCRIBUS_WPG_LIB}
-  PROPERTIES
-  COMPILE_FLAGS -DCOMPILE_SCRIBUS_MAIN_APP
-  )
+INCLUDE_DIRECTORIES(
+${CMAKE_SOURCE_DIR}
+${CMAKE_SOURCE_DIR}/scribus
+)
+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
+    WPGBinaryData.cpp
+    WPGBitmap.cpp
+    WPGBrush.cpp
+    WPGColor.cpp
+    WPGGradient.cpp
+    WPGHeader.cpp
+    WPGInternalStream.cpp
+    WPGOLEStream.cpp
+    WPGPath.cpp
+    WPGPen.cpp
+    WPGPoint.cpp
+    WPGraphics.cpp
+    WPGRect.cpp
+    WPGStreamImplementation.cpp
+    WPGString.cpp
+    WPGXParser.cpp
+  )
+
+SET(SCRIBUS_WPG_LIB "scribus_wpg_lib")
+ADD_LIBRARY(${SCRIBUS_WPG_LIB} STATIC ${WPG_SOURCES})
+
+# This is a convenience library that for linkage purposes is part of Scribus's
+# main API.
+SET_TARGET_PROPERTIES(${SCRIBUS_WPG_LIB}
+  PROPERTIES
+  COMPILE_FLAGS -DCOMPILE_SCRIBUS_MAIN_APP
+  )




More information about the scribus-commit mailing list