r18160 by craig - First part of fixing CMake/scclocale for the Haiku platform

[scribus-commit]

Author: craig
Date: Sun Feb 24 21:43:32 2013
New Revision: 18160

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=18160
Log:
First part of fixing CMake/scclocale for the Haiku platform

Modified:
    branches/Version14x/Scribus/CMakeLists.txt
    branches/Version14x/Scribus/scribus/CMakeLists.txt
    branches/Version14x/Scribus/scribus/scclocale.cpp
    branches/Version14x/Scribus/scribus/scclocale.h

Modified: branches/Version14x/Scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18160&path=/branches/Version14x/Scribus/CMakeLists.txt
==============================================================================
--- branches/Version14x/Scribus/CMakeLists.txt (original)
+++ branches/Version14x/Scribus/CMakeLists.txt Sun Feb 24 21:43:32 2013
@@ -612,7 +612,7 @@
 #>>Render Library
 
 #<<CUPS
-IF(NOT WIN32)
+IF(NOT WIN32 AND NOT HAIKU)
   IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5)
     SET(Cups_DIR ${CMAKE_MODULE_PATH})
   ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5)
@@ -621,10 +621,10 @@
     SET(HAVE_CUPS 1)
     MESSAGE("CUPS Library Found OK")
   ENDIF(CUPS_FOUND)
-ELSE(NOT WIN32)
+ELSE (NOT WIN32 AND NOT HAIKU)
   # Windows doesn't use CUPS
   SET(CUPS_INCLUDE_DIR)
-ENDIF(NOT WIN32)
+ENDIF(NOT WIN32 AND NOT HAIKU)
 #>>CUPS
 
 #<<LibXML2
@@ -770,7 +770,6 @@
   ${CMAKE_BINARY_DIR}
   ${CMAKE_BINARY_DIR}/scribus
   ${QT_INCLUDES}
-  ${CUPS_INCLUDE_DIR}
   ${FREETYPE_INCLUDE_DIR}
   ${FONTCONFIG_INCLUDE_DIR}
   ${JPEG_INCLUDE_DIR}
@@ -780,6 +779,12 @@
   ${TIFF_INCLUDE_DIR}
   ${ZLIB_INCLUDE_DIR}
 )
+
+IF(NOT WIN32 AND NOT HAIKU)
+  INCLUDE_DIRECTORIES(
+    ${CUPS_INCLUDE_DIR}
+  )
+ENDIF(NOT WIN32 AND NOT HAIKU)
 
 ##############################################################################################################
 ########## Uninstall Setup                                                                          ##########

Modified: branches/Version14x/Scribus/scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18160&path=/branches/Version14x/Scribus/scribus/CMakeLists.txt
==============================================================================
--- branches/Version14x/Scribus/scribus/CMakeLists.txt (original)
+++ branches/Version14x/Scribus/scribus/CMakeLists.txt Sun Feb 24 21:43:32 2013
@@ -767,7 +767,6 @@
 
 TARGET_LINK_LIBRARIES(${EXE_NAME}
   ${QT_LIBRARIES}
-  ${CUPS_LIBRARIES}
   ${FREETYPE_LIBRARIES}
   ${FONTCONFIG_LIBRARIES}
   ${LIBXML2_LIBRARIES}
@@ -777,6 +776,12 @@
   ${ZLIB_LIBRARIES}
   ${WIN32_ONLY_LIBS}
 )
+
+IF(NOT WIN32 AND NOT HAIKU)
+  TARGET_LINK_LIBRARIES(${EXE_NAME}
+    ${CUPS_LIBRARIES}
+  )
+ENDIF(NOT WIN32 AND NOT HAIKU)
 
 # required to resolve symbols from libdl when ld is called with --no-add-needed
 # #9310 for the OpenBSD addition

Modified: branches/Version14x/Scribus/scribus/scclocale.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18160&path=/branches/Version14x/Scribus/scribus/scclocale.cpp
==============================================================================
--- branches/Version14x/Scribus/scribus/scclocale.cpp (original)
+++ branches/Version14x/Scribus/scribus/scclocale.cpp Sun Feb 24 21:43:32 2013
@@ -24,7 +24,7 @@
 #if defined(Q_WS_WIN)
 	cLocale = _create_locale(LC_ALL, "C");
 #else
-  #if not defined(Q_OS_SOLARIS) and not defined(Q_OS_OPENBSD) and not defined (Q_OS_FREEBSD)
+  #if not defined(Q_OS_SOLARIS) and not defined(Q_OS_OPENBSD) and not defined (Q_OS_FREEBSD) and not defined (Q_OS_HAIKU)
 	cLocale = newlocale(LC_ALL_MASK, "C", NULL);
   #endif
 #endif
@@ -35,7 +35,7 @@
 #if defined(Q_WS_WIN)
 	_free_locale(cLocale);
 #else
-  #if not defined(Q_OS_SOLARIS) and not defined(Q_OS_OPENBSD) and not defined (Q_OS_FREEBSD)
+  #if not defined(Q_OS_SOLARIS) and not defined(Q_OS_OPENBSD) and not defined (Q_OS_FREEBSD) and not defined (Q_OS_HAIKU)
 	freelocale(cLocale);
   #endif
 #endif
@@ -110,7 +110,7 @@
 #if defined(Q_WS_WIN)
 		return _strtod_l(str, endptr, that()->cLocale);
 #else
-  #if defined(Q_OS_SOLARIS) or defined (Q_OS_OPENBSD) or defined (Q_OS_FREEBSD)
+  #if defined(Q_OS_SOLARIS) or defined (Q_OS_OPENBSD) or defined (Q_OS_FREEBSD) and not defined (Q_OS_HAIKU)
 		char *oldlocale=setlocale(LC_NUMERIC, NULL);
 		double result(0.0);
 		setlocale(LC_NUMERIC, "C");

Modified: branches/Version14x/Scribus/scribus/scclocale.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=18160&path=/branches/Version14x/Scribus/scribus/scclocale.h
==============================================================================
--- branches/Version14x/Scribus/scribus/scclocale.h (original)
+++ branches/Version14x/Scribus/scribus/scclocale.h Sun Feb 24 21:43:32 2013
@@ -21,14 +21,14 @@
 #include <xlocale.h>
 #endif
 
-#if defined(Q_OS_SOLARIS) || defined (Q_OS_OPENBSD) || defined (Q_OS_FREEBSD)
+#if defined(Q_OS_SOLARIS) || defined (Q_OS_OPENBSD) || defined (Q_OS_FREEBSD) || defined (Q_OS_HAIKU)
 #include <locale.h>
 #endif
 
 #if defined(Q_WS_WIN)
 #define XLocaleType _locale_t
 #else
-  #if defined (Q_OS_SOLARIS) || defined (Q_OS_OPENBSD) || defined (Q_OS_FREEBSD)
+  #if defined (Q_OS_SOLARIS) || defined (Q_OS_OPENBSD) || defined (Q_OS_FREEBSD) || defined (Q_OS_HAIKU)
   #define XLocaleType char*   //dummy?
   #else
   #define XLocaleType locale_t