[SCM] OCE packaging branch, debian, updated. debian/0.11-1

[Denis Barbier]

The following commit has been merged in the debian branch:
commit b653c9c4a8d96b6f53a771507d24e54893e00e16
Author: Denis Barbier <bouzim at gmail.com>
Date:   Fri Jun 8 15:06:47 2012 +0200

    Wrap the new TKQADraw module introduced in OCCT 6.5.3
    
    Prepend OCE_ to HAVE_IOSTREAM and HAVE_FSTREAM macros.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0e28c86..d9169c4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -977,14 +977,9 @@ IF(${PROJECT_NAME}_DATAEXCHANGE)
 	PROCESS_MODULE( "Data Exchange" "TKSTL;TKXSBase;TKSTEPBase;TKIGES;TKSTEPAttr;TKSTEP209;TKSTEP" "TKVRML;TKXCAF;TKXCAFSchema;TKXmlXCAF;TKBinXCAF;TKXDEIGES;TKXDESTEP" )
 ENDIF(${PROJECT_NAME}_DATAEXCHANGE)
 
-# Draw
-IF(${PROJECT_NAME}_DRAW)
-	PROCESS_MODULE( "Draw" "" "TKDraw;TKTopTest;TKViewerTest;TKXSDRAW;TKDCAF;TKXDEDRAW;TKTObjDRAW" )
-ENDIF(${PROJECT_NAME}_DRAW)
-
 # DRAWEXE application
 IF(${PROJECT_NAME}_DRAW)
-	PROCESS_MODULE( "Draw" "" DRAWEXE )
+	PROCESS_MODULE( "Draw" "" "TKDraw;TKTopTest;TKViewerTest;TKXSDRAW;TKDCAF;TKXDEDRAW;TKTObjDRAW;TKQADraw;DRAWEXE" )
 ENDIF(${PROJECT_NAME}_DRAW)
 
 CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/ProjectConfig.cmake.in
diff --git a/adm/cmake/TKQADraw/CMakeLists.txt b/adm/cmake/TKQADraw/CMakeLists.txt
new file mode 100644
index 0000000..9bbdfca
--- /dev/null
+++ b/adm/cmake/TKQADraw/CMakeLists.txt
@@ -0,0 +1,47 @@
+SET(TOOLKIT TKQADraw)
+
+SET(TOOLKIT_MODULES
+	DebugTools
+	QABugs
+	QADNaming
+	QADraw
+	QANCollection
+	QANewBRepNaming
+	QANewModTopOpe
+)
+SET(TOOLKIT_DEPENDS
+	TKernel
+	TKG3d
+	TKMath
+	TKBRep
+	TKTopAlgo
+	TKG2d
+	TKGeomBase
+	TKGeomAlgo
+	TKPrim
+	TKCDF
+	TKShHealing
+	TKBool
+	TKLCAF
+	TKOffset
+	TKFeat
+	TKXSBase
+	TKCAF
+	TKV3d
+	TKIGES
+	TKService
+	TKDraw
+	TKViewerTest
+)
+SET(TOOLKIT_INCLUDE_DIRECTORIES ${TCL_INCLUDE_PATH})
+SET(TOOLKIT_LIBS ${TCL_LIBRARY} ${CSF_gdi32_LIB} ${CSF_advapi32_LIB} ${CSF_user32_LIB})
+
+IF(NOT WIN32)
+	SET(TOOLKIT_INCLUDE_DIRECTORIES ${TOOLKIT_INCLUDE_DIRECTORIES} ${X11_X11_INCLUDE_PATH} ${TK_INCLUDE_PATH})
+	SET(TOOLKIT_LIBS ${TOOLKIT_LIBS} ${TK_LIBRARY} ${X11_X11_LIB})
+ENDIF(NOT WIN32)
+
+SET(TOOLKIT_IS_PRIVATE TRUE)
+
+INCLUDE(../BuildToolkit.cmake)
+
diff --git a/adm/cmake/FWOSPlugin/Precompiled.cpp b/adm/cmake/TKQADraw/Precompiled.cpp
similarity index 100%
copy from adm/cmake/FWOSPlugin/Precompiled.cpp
copy to adm/cmake/TKQADraw/Precompiled.cpp
diff --git a/adm/cmake/TKDraw/Precompiled.h b/adm/cmake/TKQADraw/Precompiled.h
similarity index 100%
copy from adm/cmake/TKDraw/Precompiled.h
copy to adm/cmake/TKQADraw/Precompiled.h
diff --git a/src/QABugs/QABugs_3.cxx b/src/QABugs/QABugs_3.cxx
index 8605f90..bfd47b2 100644
--- a/src/QABugs/QABugs_3.cxx
+++ b/src/QABugs/QABugs_3.cxx
@@ -18,10 +18,10 @@
 // and conditions governing the rights and limitations under the License.
 
 
-#include <QABugs.hxx>
 #ifdef HAVE_CONFIG_H
 #include <oce-config.h>
 #endif
+#include <QABugs.hxx>
 #include<Draw_Interpretor.hxx>
 #include<TopLoc_Location.hxx>
 #include<TopoDS_Face.hxx>
@@ -287,15 +287,15 @@ void stringerror(int state)
 //#else
 //#include <strstream.h>
 //#endif
-#ifdef HAVE_IOSTREAM
+#ifdef OCE_HAVE_IOSTREAM
 #include <iostream>
 #include <sstream>
 using namespace std;
-#elif defined (HAVE_IOSTREAM_H)
+#elif defined (OCE_HAVE_IOSTREAM_H)
 #include <iostream.h>
 #include <strstream.h>
 #else
-#error "check oce-config.h file or compilation options: either HAVE_IOSTREAM or HAVE_IOSTREAM_H should be defined"
+#error "check oce-config.h file or compilation options: either OCE_HAVE_IOSTREAM or OCE_HAVE_IOSTREAM_H should be defined"
 #endif
 static int UKI61075(Draw_Interpretor& /*di*/, Standard_Integer /*argc*/, const char ** /*argv*/) {
  double da,db;
@@ -1405,9 +1405,9 @@ static Standard_Integer BUC60856(Draw_Interpretor& di, Standard_Integer /*argc*/
 
 #if ! defined(WNT)
 //#include <fstream.h>
-#ifdef HAVE_FSTREAM
+#ifdef OCE_HAVE_FSTREAM
 # include <fstream>
-#elif defined (HAVE_FSTREAM_H)
+#elif defined (OCE_HAVE_FSTREAM_H)
 # include <fstream.h> 
 #endif
 //#include <Standard_Stream.hxx>

-- 
OCE packaging