+ restore lost changes, improve whitspaces, suppress useless MSVC warnings
This commit is contained in:
parent
f4e7a2e2a0
commit
5c269996b8
2
src/3rdParty/salomesmesh/CMakeLists.txt
vendored
2
src/3rdParty/salomesmesh/CMakeLists.txt
vendored
|
@ -127,7 +127,7 @@ ELSE(UNIX)
|
|||
######### Windows ###########
|
||||
#MESSAGE("-- Windows system detected")
|
||||
IF(MSVC)
|
||||
ADD_DEFINITIONS(-DWNT -DWIN32 -D_WINDOWS -DCSFDB -DUSE_CLOCK -DMSDOS -DNO_ONEXIT -DNO_My_ctype -DNO_ISATTY -DNO_FPINIT /wd4290 /wd4251 /wd4018 /wd4800 /wd4996 /wd4244 /wd4806 /wd4275)
|
||||
ADD_DEFINITIONS(-DWNT -DWIN32 -D_WINDOWS -DCSFDB -DUSE_CLOCK -DMSDOS -DNO_ONEXIT -DNO_My_ctype -DNO_ISATTY -DNO_FPINIT /wd4290 /wd4251 /wd4018 /wd4800 /wd4996 /wd4244 /wd4806 /wd4275 /wd4005 /wd4099 /wd4101 /wd4267 /wd4390)
|
||||
ELSE(MSVC)
|
||||
ADD_DEFINITIONS(-DWNT -DWIN32 -D_WINDOWS -DCSFDB)
|
||||
ENDIF(MSVC)
|
||||
|
|
|
@ -412,7 +412,9 @@ MainWindow::MainWindow(QWidget * parent, Qt::WFlags f)
|
|||
(QString::fromAscii(QT_TRANSLATE_NOOP("QDockWidget","Python console")));
|
||||
pDockMgr->registerDockWindow("Std_PythonView", pcPython);
|
||||
|
||||
#if 0 //defined(Q_OS_WIN32) this porsion of code is not able to run with a vanilla Qtlib build on Windows. Since it is not build on Linux I pressume its not needed.... (JR 8.2014)
|
||||
#if 0 //defined(Q_OS_WIN32) this portion of code is not able to run with a vanilla Qtlib build on Windows.
|
||||
// The MainWindowTabBar is used to show tabbed dock windows with icons
|
||||
//
|
||||
// add our own QTabBar-derived class to the main window layout
|
||||
// NOTE: This uses some private stuff from QMainWindow which doesn't
|
||||
// seem to be accessible on all platforms.
|
||||
|
|
|
@ -36,6 +36,6 @@ ParGrp.SetString("WorkBenchName", "Points Design")
|
|||
|
||||
# Append the open handler
|
||||
FreeCAD.EndingAdd("Point formats (*.asc)","Points")
|
||||
FreeCAD.EndingAdd("Ply points (*.ply)","Points")
|
||||
FreeCAD.EndingAdd("PLY points (*.ply)","Points")
|
||||
|
||||
|
||||
|
|
|
@ -39,6 +39,12 @@
|
|||
# define PointsExport
|
||||
#endif
|
||||
|
||||
#ifdef _MSC_VER
|
||||
# pragma warning(disable : 4181)
|
||||
# pragma warning(disable : 4275)
|
||||
# pragma warning(disable : 4305)
|
||||
#endif
|
||||
|
||||
#ifdef _PreComp_
|
||||
|
||||
// standard
|
||||
|
|
Loading…
Reference in New Issue
Block a user