r14373 by cbradney - Add Snow Leopard detection, potentially a bit hacky.. and use 64 bit on SL

scribus-commit scribus-commit at lists.scribus.net
Thu Dec 3 00:35:27 CET 2009


Revision: 14373
Author: cbradney
Date: 2009-12-02T13:33:09.573709Z
Commit message: Add Snow Leopard detection, potentially a bit hacky.. and use 64 bit on SL

Changeset: 
M  /trunk/Scribus/scribus/ui/prefs_itemtools.cpp
M  /trunk/Scribus/scribus/ui/prefs_itemtools.h
M  /trunk/Scribus/scribus/ui/prefs_itemtoolsbase.ui
M  /trunk/Scribus/CMakeLists.txt
M  /trunk/Scribus/scribus/ui/insertaframe.h

Diffs:
Index: scribus/ui/prefs_itemtools.cpp
===================================================================
--- scribus/ui/prefs_itemtools.cpp	(revision 14372)
+++ scribus/ui/prefs_itemtools.cpp	(revision 14373)
@@ -5,16 +5,38 @@
 for which a new license (GPL+exception) is in place.
 */
 
-#include "prefs_itemtools.h"
+#include "ui/prefs_itemtools.h"
+#include "prefsstructs.h"
+#include "scrspinbox.h"
+#include "units.h"
 
 Prefs_ItemTools::Prefs_ItemTools(QWidget* parent)
-	: QWidget(parent)
+	: Prefs_Pane(parent)
 {
 	setupUi(this);
-
+	languageChange();
 }
 
 Prefs_ItemTools::~Prefs_ItemTools()
 {
 }
 
+
+void Prefs_ItemTools::languageChange()
+{
+}
+
+void Prefs_ItemTools::unitChange(int newIndex)
+{
+
+}
+
+void Prefs_ItemTools::restoreDefaults(struct ApplicationPrefs *prefsData)
+{
+	int docUnitIndex = prefsData->docSetupPrefs.docUnitIndex;
+	unitChange(docUnitIndex);
+}
+
+void Prefs_ItemTools::saveGuiToPrefs(struct ApplicationPrefs *prefsData) const
+{
+}
Index: scribus/ui/prefs_itemtoolsbase.ui
===================================================================
--- scribus/ui/prefs_itemtoolsbase.ui	(revision 14372)
+++ scribus/ui/prefs_itemtoolsbase.ui	(revision 14373)
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>645</width>
-    <height>854</height>
+    <width>571</width>
+    <height>756</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -67,8 +67,8 @@
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>571</width>
-            <height>724</height>
+            <width>497</width>
+            <height>626</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_2">
@@ -90,7 +90,7 @@
                 </widget>
                </item>
                <item row="2" column="1">
-                <widget class="QSpinBox" name="spinBox_2"/>
+                <widget class="QSpinBox" name="textColumnsSpinBox"/>
                </item>
                <item row="3" column="0">
                 <widget class="QLabel" name="label_17">
@@ -100,7 +100,7 @@
                 </widget>
                </item>
                <item row="3" column="1">
-                <widget class="QSpinBox" name="spinBox_8"/>
+                <widget class="QSpinBox" name="textColumnGapSpinBox"/>
                </item>
                <item row="4" column="0">
                 <widget class="QLabel" name="label_9">
@@ -110,7 +110,7 @@
                 </widget>
                </item>
                <item row="4" column="1">
-                <widget class="QComboBox" name="comboBox_6"/>
+                <widget class="QComboBox" name="textTabFillCharComboBox"/>
                </item>
                <item row="5" column="0">
                 <widget class="QLabel" name="label_14">
@@ -120,10 +120,10 @@
                 </widget>
                </item>
                <item row="5" column="1">
-                <widget class="QSpinBox" name="spinBox_7"/>
+                <widget class="QSpinBox" name="textTabWidthSpinBox"/>
                </item>
                <item row="0" column="1">
-                <widget class="QComboBox" name="comboBox_12"/>
+                <widget class="QComboBox" name="textFrameFillColorComboBox"/>
                </item>
                <item row="0" column="0">
                 <widget class="QLabel" name="label_30">
@@ -140,7 +140,7 @@
                 </widget>
                </item>
                <item row="1" column="1">
-                <widget class="QComboBox" name="comboBox_13"/>
+                <widget class="QComboBox" name="textFrameLineColorComboBox"/>
                </item>
               </layout>
              </item>
@@ -177,10 +177,10 @@
                 </widget>
                </item>
                <item row="1" column="1">
-                <widget class="QSpinBox" name="spinBox_15"/>
+                <widget class="QSpinBox" name="textFrameLineShadingSpinBox"/>
                </item>
                <item row="0" column="1">
-                <widget class="QSpinBox" name="spinBox_16"/>
+                <widget class="QSpinBox" name="textFrameFillShadingSpinBox"/>
                </item>
               </layout>
              </item>
@@ -253,7 +253,7 @@
                 </widget>
                </item>
                <item row="0" column="1">
-                <widget class="QComboBox" name="comboBox"/>
+                <widget class="QComboBox" name="textFontComboBox"/>
                </item>
                <item row="1" column="0">
                 <widget class="QLabel" name="label_4">
@@ -263,7 +263,7 @@
                 </widget>
                </item>
                <item row="1" column="1">
-                <widget class="QSpinBox" name="spinBox"/>
+                <widget class="QSpinBox" name="textSizeSpinBox"/>
                </item>
                <item row="2" column="0">
                 <widget class="QLabel" name="label_5">
@@ -273,7 +273,7 @@
                 </widget>
                </item>
                <item row="2" column="1">
-                <widget class="QComboBox" name="comboBox_2"/>
+                <widget class="QComboBox" name="textColorComboBox"/>
                </item>
                <item row="3" column="0">
                 <widget class="QLabel" name="label_6">
@@ -283,7 +283,7 @@
                 </widget>
                </item>
                <item row="3" column="1">
-                <widget class="QComboBox" name="comboBox_3"/>
+                <widget class="QComboBox" name="textStrokeColorComboBox"/>
                </item>
               </layout>
              </item>
@@ -339,7 +339,7 @@
                 </widget>
                </item>
                <item row="2" column="1">
-                <widget class="QSpinBox" name="spinBox_5"/>
+                <widget class="QSpinBox" name="textColorShadingSpinBox"/>
                </item>
                <item row="3" column="0">
                 <widget class="QLabel" name="label_15">
@@ -349,7 +349,7 @@
                 </widget>
                </item>
                <item row="3" column="1">
-                <widget class="QSpinBox" name="spinBox_6"/>
+                <widget class="QSpinBox" name="textStrokeShadingSpinBox"/>
                </item>
               </layout>
              </item>
@@ -405,7 +405,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QWidget" name="widget" native="true">
+            <widget class="QWidget" name="textPreviewWidget" native="true">
              <property name="minimumSize">
               <size>
                <width>0</width>
@@ -456,7 +456,7 @@
             </widget>
            </item>
            <item row="0" column="1">
-            <widget class="QComboBox" name="comboBox_8"/>
+            <widget class="QComboBox" name="imageFrameFillColorComboBox"/>
            </item>
            <item row="1" column="0">
             <widget class="QLabel" name="label_26">
@@ -466,7 +466,7 @@
             </widget>
            </item>
            <item row="1" column="1">
-            <widget class="QComboBox" name="comboBox_9"/>
+            <widget class="QComboBox" name="imageFrameLineColorComboBox"/>
            </item>
           </layout>
          </item>
@@ -475,9 +475,12 @@
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
+           <property name="sizeType">
+            <enum>QSizePolicy::Fixed</enum>
+           </property>
            <property name="sizeHint" stdset="0">
             <size>
-             <width>40</width>
+             <width>20</width>
              <height>20</height>
             </size>
            </property>
@@ -500,10 +503,10 @@
             </widget>
            </item>
            <item row="1" column="1">
-            <widget class="QSpinBox" name="spinBox_12"/>
+            <widget class="QSpinBox" name="imageFrameLineShadingSpinBox"/>
            </item>
            <item row="0" column="1">
-            <widget class="QSpinBox" name="spinBox_11"/>
+            <widget class="QSpinBox" name="imageFrameFillShadingSpinBox"/>
            </item>
           </layout>
          </item>
@@ -523,7 +526,7 @@
         </layout>
        </item>
        <item>
-        <widget class="QCheckBox" name="checkBox_2">
+        <widget class="QCheckBox" name="imageUseEmbeddedClippingPathCheckBox">
          <property name="text">
           <string>Use Embedded Clipping Path</string>
          </property>
@@ -566,7 +569,7 @@
         </widget>
        </item>
        <item>
-        <widget class="QRadioButton" name="radioButton">
+        <widget class="QRadioButton" name="imageFreeScalingRadioButton">
          <property name="text">
           <string>Free Scaling</string>
          </property>
@@ -584,22 +587,22 @@
             </widget>
            </item>
            <item row="0" column="1">
-            <widget class="QSpinBox" name="spinBox_9"/>
+            <widget class="QSpinBox" name="imageHorizontalScalingSpinBox"/>
            </item>
            <item row="1" column="0">
             <widget class="QLabel" name="label_20">
              <property name="text">
-              <string>Vertical Scaling</string>
+              <string>Vertical Scaling:</string>
              </property>
             </widget>
            </item>
            <item row="1" column="1">
-            <widget class="QSpinBox" name="spinBox_10"/>
+            <widget class="QSpinBox" name="imageVerticalScalingSpinBox"/>
            </item>
           </layout>
          </item>
          <item>
-          <widget class="QToolButton" name="toolButton">
+          <widget class="QToolButton" name="scalingLockToolButton">
            <property name="text">
             <string>...</string>
            </property>
@@ -621,7 +624,7 @@
         </layout>
        </item>
        <item>
-        <widget class="QRadioButton" name="radioButton_2">
+        <widget class="QRadioButton" name="imageFrameScalingRadioButton">
          <property name="text">
           <string>Scale Image to Frame Size</string>
          </property>
@@ -644,7 +647,7 @@
         </spacer>
        </item>
        <item>
-        <widget class="QCheckBox" name="checkBox">
+        <widget class="QCheckBox" name="imageKeepAspectRatioCheckBox">
          <property name="text">
           <string>Keep Aspect Ratio</string>
          </property>
@@ -687,21 +690,21 @@
         </widget>
        </item>
        <item>
-        <widget class="QRadioButton" name="radioButton_3">
+        <widget class="QRadioButton" name="onscreenResolutionFullRadioButton">
          <property name="text">
           <string>Full Resolution</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QRadioButton" name="radioButton_4">
+        <widget class="QRadioButton" name="onscreenResolutionNormalRadioButton">
          <property name="text">
           <string>Normal Resolution</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QRadioButton" name="radioButton_5">
+        <widget class="QRadioButton" name="onscreenResolutionLowRadioButton">
          <property name="text">
           <string>Low Resolution</string>
          </property>
@@ -745,7 +748,7 @@
             </widget>
            </item>
            <item row="0" column="1">
-            <widget class="QComboBox" name="comboBox_10"/>
+            <widget class="QComboBox" name="shapeFrameFillColorComboBox"/>
            </item>
            <item row="1" column="0">
             <widget class="QLabel" name="label_28">
@@ -755,7 +758,7 @@
             </widget>
            </item>
            <item row="1" column="1">
-            <widget class="QComboBox" name="comboBox_11"/>
+            <widget class="QComboBox" name="shapeFrameLineColorComboBox"/>
            </item>
            <item row="2" column="0">
             <widget class="QLabel" name="label_7">
@@ -772,10 +775,10 @@
             </widget>
            </item>
            <item row="2" column="1">
-            <widget class="QComboBox" name="comboBox_4"/>
+            <widget class="QComboBox" name="shapeFrameLineStyleComboBox"/>
            </item>
            <item row="3" column="1">
-            <widget class="QSpinBox" name="spinBox_17"/>
+            <widget class="QSpinBox" name="shapeLineWidthSpinBox"/>
            </item>
           </layout>
          </item>
@@ -784,9 +787,12 @@
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
+           <property name="sizeType">
+            <enum>QSizePolicy::Fixed</enum>
+           </property>
            <property name="sizeHint" stdset="0">
             <size>
-             <width>40</width>
+             <width>20</width>
              <height>20</height>
             </size>
            </property>
@@ -809,10 +815,10 @@
             </widget>
            </item>
            <item row="1" column="1">
-            <widget class="QSpinBox" name="spinBox_13"/>
+            <widget class="QSpinBox" name="shapeFrameLineShadingSpinBox"/>
            </item>
            <item row="0" column="1">
-            <widget class="QSpinBox" name="spinBox_14"/>
+            <widget class="QSpinBox" name="shapeFrameFillShadingSpinBox"/>
            </item>
           </layout>
          </item>
@@ -868,10 +874,10 @@
               </widget>
              </item>
              <item row="0" column="1">
-              <widget class="QSpinBox" name="spinBox_21"/>
+              <widget class="QSpinBox" name="polygonCornerCountSpinBox"/>
              </item>
              <item row="1" column="1">
-              <widget class="QSpinBox" name="spinBox_22"/>
+              <widget class="QSpinBox" name="polygonRotationSpinBox"/>
              </item>
              <item row="1" column="0">
               <widget class="QLabel" name="label_42">
@@ -883,7 +889,7 @@
             </layout>
            </item>
            <item>
-            <widget class="QCheckBox" name="checkBox_3">
+            <widget class="QCheckBox" name="applyFactorCheckBox">
              <property name="text">
               <string>Apply Factor</string>
              </property>
@@ -902,7 +908,7 @@
               </widget>
              </item>
              <item row="0" column="1">
-              <widget class="QSpinBox" name="spinBox_23"/>
+              <widget class="QSpinBox" name="polygonFactorSpinBox"/>
              </item>
              <item row="2" column="0">
               <widget class="QLabel" name="label_44">
@@ -912,17 +918,17 @@
               </widget>
              </item>
              <item row="2" column="1">
-              <widget class="QSpinBox" name="spinBox_24"/>
+              <widget class="QSpinBox" name="polygonCurvatureSpinBox"/>
              </item>
              <item row="3" column="0" colspan="2">
-              <widget class="QSlider" name="horizontalSlider_2">
+              <widget class="QSlider" name="polygonCurvatureSlider">
                <property name="orientation">
                 <enum>Qt::Horizontal</enum>
                </property>
               </widget>
              </item>
              <item row="1" column="0" colspan="2">
-              <widget class="QSlider" name="horizontalSlider">
+              <widget class="QSlider" name="polygonFactorSlider">
                <property name="orientation">
                 <enum>Qt::Horizontal</enum>
                </property>
@@ -949,7 +955,7 @@
           </spacer>
          </item>
          <item>
-          <widget class="QWidget" name="widget_2" native="true">
+          <widget class="QWidget" name="polygonPreviewWidet" native="true">
            <property name="minimumSize">
             <size>
              <width>100</width>
@@ -1018,7 +1024,7 @@
            </widget>
           </item>
           <item row="0" column="1">
-           <widget class="QComboBox" name="comboBox_15"/>
+           <widget class="QComboBox" name="lineFillColorComboBox"/>
           </item>
           <item row="1" column="0">
            <widget class="QLabel" name="label_36">
@@ -1028,7 +1034,7 @@
            </widget>
           </item>
           <item row="1" column="1">
-           <widget class="QComboBox" name="comboBox_5"/>
+           <widget class="QComboBox" name="lineStyleComboBox"/>
           </item>
           <item row="2" column="0">
            <widget class="QLabel" name="label_37">
@@ -1038,7 +1044,7 @@
            </widget>
           </item>
           <item row="2" column="1">
-           <widget class="QSpinBox" name="spinBox_18"/>
+           <widget class="QSpinBox" name="lineWidthSpinBox"/>
           </item>
           <item row="3" column="0">
            <widget class="QLabel" name="label_34">
@@ -1055,10 +1061,10 @@
            </widget>
           </item>
           <item row="3" column="1">
-           <widget class="QComboBox" name="comboBox_7"/>
+           <widget class="QComboBox" name="lineStartArrowComboBox"/>
           </item>
           <item row="4" column="1">
-           <widget class="QComboBox" name="comboBox_14"/>
+           <widget class="QComboBox" name="lineEndArrowComboBox"/>
           </item>
          </layout>
         </item>
@@ -1095,7 +1101,7 @@
            <widget class="QSpinBox" name="spinBox_19"/>
           </item>
           <item row="0" column="1">
-           <widget class="QSpinBox" name="spinBox_20"/>
+           <widget class="QSpinBox" name="lineFillColorShadingSpinBox"/>
           </item>
          </layout>
         </item>
Index: scribus/ui/insertaframe.h
===================================================================
--- scribus/ui/insertaframe.h	(revision 14372)
+++ scribus/ui/insertaframe.h	(revision 14373)
@@ -25,6 +25,9 @@
 #include <QString>
 
 
+#include <QDialog>
+
+
 class PageItem;
 class ScribusDoc;
 struct InsertAFrameData;
Index: scribus/ui/prefs_itemtools.h
===================================================================
--- scribus/ui/prefs_itemtools.h	(revision 14372)
+++ scribus/ui/prefs_itemtools.h	(revision 14373)
@@ -9,15 +9,21 @@
 #define PREFS_ITEMTOOLS_H
 
 #include "ui_prefs_itemtoolsbase.h"
+#include "prefs_pane.h"
 #include "scribusapi.h"
 
-class SCRIBUS_API Prefs_ItemTools : public QWidget, Ui::Prefs_ItemTools
+class SCRIBUS_API Prefs_ItemTools : public Prefs_Pane, Ui::Prefs_ItemTools
 {
 	Q_OBJECT
 
 	public:
 		Prefs_ItemTools(QWidget* parent=0);
 		~Prefs_ItemTools();
+		virtual void restoreDefaults(struct ApplicationPrefs *prefsData);
+		virtual void saveGuiToPrefs(struct ApplicationPrefs *prefsData) const;
+	public slots:
+		void languageChange();
+		void unitChange(int newIndex);
 };
 
 #endif // PREFS_ITEMTOOLS_H
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt	(revision 14372)
+++ CMakeLists.txt	(revision 14373)
@@ -73,7 +73,7 @@
 PROJECT(scribus)
 #Set our version values
 #Final version is ${VERSION} = ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX}
-#where VERSION_SUFFIX is of the form "", "cvs" or "Ncvs" (N being the minor patch level)
+#where VERSION_SUFFIX is of the form "", "svn" or "Nsvn" (N being the minor patch level)
 SET (VERSION_MAJOR "1")
 SET (VERSION_MINOR "5")
 SET (VERSION_PATCH "0")
@@ -95,12 +95,18 @@
     OUTPUT_VARIABLE MACHINE
     OUTPUT_STRIP_TRAILING_WHITESPACE
 )
-
+MESSAGE(STATUS  "Machine: ${MACHINE}, void pointer size: ${CMAKE_SIZEOF_VOID_P}")
 STRING(REGEX MATCH "(i?86-*)|(athlon-*)|(pentium-*)" _machine_x86 "${MACHINE}")
 IF (_machine_x86)
     MESSAGE(STATUS "Found target X86")
     SET(ARCH_X86 1)
 ENDIF (_machine_x86)
+IF (APPLE AND CMAKE_SIZEOF_VOID_P EQUAL 8 AND ARCH_X86 EQUAL 1)
+  MESSAGE(STATUS "Found Snow Leopard Target: Apple, 64 bit, X86")
+  UNSET(ARCH_X86)
+  SET(ARCH_X86_64 1)
+  SET(APPLE_10_6_X 1)
+ENDIF (APPLE AND CMAKE_SIZEOF_VOID_P EQUAL 8 AND ARCH_X86 EQUAL 1)
 
 STRING(REGEX MATCH "(x86_64-*)|(X86_64-*)|(AMD64-*)|(amd64-*)" _machine_x86_64 "${MACHINE}")
 IF (_machine_x86_64)
@@ -327,38 +333,50 @@
 
 #Based on our build type, setup our build options
 IF(APPLE)
+  IF (APPLE_10_6_X)
+	SET(OSXMINVER "10.6" CACHE TYPE STRING)
+  ELSEIF (APPLE_10_6_X)
+	SET(OSXMINVER "10.4" CACHE TYPE STRING)
+  ENDIF (APPLE_10_6_X)
   # gcc/mac
   IF(WANT_UNIVERSAL_BUNDLE)
     MESSAGE("Setting Universal (PPC/i386) Architecture for OSX Build/Bundle")
     SET(CMAKE_OSX_ARCHITECTURES "ppc;i386" )
     SET(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES "ppc;i386" )
-    SET(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.4u.sdk")
+	SET(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.4u.sdk")
   ELSE(WANT_UNIVERSAL_BUNDLE)
     IF(ARCH_PPC OR ARCH_PPC_64)
       MESSAGE("Setting PPC Architecture for OSX Build/Bundle")
       SET(CMAKE_OSX_ARCHITECTURES "ppc" )
       SET(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES "ppc" )
-    ELSE(ARCH_PPC OR ARCH_PPC_64)
-      MESSAGE("Setting i386 Architecture for OSX Build/Bundle")
-      SET(CMAKE_OSX_ARCHITECTURES "i386" )
-      SET(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES "i386" )   
+	ELSE(ARCH_PPC OR ARCH_PPC_64 OR APPLE_10_6_X)
+	  IF (APPLE_10_6_X)
+		MESSAGE("Setting x86_64 Architecture for OSX Build/Bundle")
+		SET(CMAKE_OSX_ARCHITECTURES "x86_64" )
+		SET(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES "x86_64" )
+	  ELSEIF (APPLE_10_6_X)
+		MESSAGE("Setting i386 Architecture for OSX Build/Bundle")
+		SET(CMAKE_OSX_ARCHITECTURES "i386" )
+		SET(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES "i386" )
+	  ENDIF (APPLE_10_6_X)
+
     ENDIF(ARCH_PPC OR ARCH_PPC_64)
   ENDIF(WANT_UNIVERSAL_BUNDLE)
   MESSAGE(STATUS "${CMAKE_OSX_ARCHITECTURES} ${CMAKE_OSX_SYSROOT}")
-  SET( ENV{MACOSX_DEPLOYMENT_TARGET} 10.4 ) 
+  SET(ENV{MACOSX_DEPLOYMENT_TARGET} ${OSXMINVER} )
   SET( ENV{LD_PREBIND} 1 )
   SET( ENV{LD_PREBIND_ALLOW_OVERLAP} 1 )
   IF (WANT_DEBUG)
-	SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g3 -fno-inline-functions -Wall -mmacosx-version-min=10.4")
-	SET(CMAKE_C_FLAGS_DEBUG "-O0 -g3 -fno-inline-functions -Wall -mmacosx-version-min=10.4")
+	SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g3 -fno-inline-functions -Wall -mmacosx-version-min=${OSXMINVER}")
+	SET(CMAKE_C_FLAGS_DEBUG "-O0 -g3 -fno-inline-functions -Wall -mmacosx-version-min=${OSXMINVER}")
   ENDIF (WANT_DEBUG)
   IF (WANT_RELEASEWITHDEBUG)
-	SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g3 -fno-inline-functions -Wall -mmacosx-version-min=10.4")
-	SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g3 -fno-inline-functions -Wall -mmacosx-version-min=10.4")
+	SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g3 -fno-inline-functions -Wall -mmacosx-version-min=${OSXMINVER}")
+	SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g3 -fno-inline-functions -Wall -mmacosx-version-min=${OSXMINVER}")
   ENDIF (WANT_RELEASEWITHDEBUG)
   IF (NOT WANT_DEBUG AND NOT WANT_RELEASEWITHDEBUG)
-	SET(CMAKE_CXX_FLAGS_RELEASE "-O2 -fno-inline-functions -Wall -mmacosx-version-min=10.4")
-	SET(CMAKE_C_FLAGS_RELEASE "-O2 -fno-inline-functions -Wall -mmacosx-version-min=10.4")
+	SET(CMAKE_CXX_FLAGS_RELEASE "-O2 -fno-inline-functions -Wall -mmacosx-version-min=${OSXMINVER}")
+	SET(CMAKE_C_FLAGS_RELEASE "-O2 -fno-inline-functions -Wall -mmacosx-version-min=${OSXMINVER}")
   ENDIF (NOT WANT_DEBUG AND NOT WANT_RELEASEWITHDEBUG)
 ELSE(APPLE)
   IF(${CMAKE_GENERATOR} MATCHES "^(Visual Studio|NMake).*")




More information about the scribus-commit mailing list