From e8db689b4dd96ab0e949a23c78036dcbd81ba06d Mon Sep 17 00:00:00 2001 From: vsv Date: Mon, 11 Mar 2019 14:52:20 +0300 Subject: [PATCH] Remove extra warnings --- .salomeport | 1 + doc/swig/doxyfile.in | 6 +++--- src/BuildAPI/CMakeLists.txt | 1 + src/CollectionAPI/CMakeLists.txt | 2 ++ src/Config/CMakeLists.txt | 2 +- src/ConnectorAPI/CMakeLists.txt | 1 + src/ConstructionAPI/CMakeLists.txt | 2 ++ src/Events/CMakeLists.txt | 2 +- src/ExchangeAPI/CMakeLists.txt | 2 ++ src/FeaturesAPI/CMakeLists.txt | 1 + src/GDMLAPI/CMakeLists.txt | 1 + src/GeomAPI/CMakeLists.txt | 2 +- src/GeomAlgoAPI/CMakeLists.txt | 2 +- src/GeomDataAPI/CMakeLists.txt | 2 +- src/ModelAPI/CMakeLists.txt | 2 +- src/ModelGeomAlgo/CMakeLists.txt | 2 +- src/ModelHighAPI/CMakeLists.txt | 1 + src/ParametersAPI/CMakeLists.txt | 2 ++ src/PartSetAPI/CMakeLists.txt | 2 ++ src/PrimitivesAPI/CMakeLists.txt | 1 + src/SketchAPI/CMakeLists.txt | 2 ++ src/SketchSolver/PlaneGCSSolver/CMakeLists.txt | 3 +++ 22 files changed, 32 insertions(+), 10 deletions(-) create mode 100644 .salomeport diff --git a/.salomeport b/.salomeport new file mode 100644 index 000000000..145d7e23c --- /dev/null +++ b/.salomeport @@ -0,0 +1 @@ +2810 \ No newline at end of file diff --git a/doc/swig/doxyfile.in b/doc/swig/doxyfile.in index 60b3b276e..eded67497 100644 --- a/doc/swig/doxyfile.in +++ b/doc/swig/doxyfile.in @@ -43,7 +43,7 @@ SUBGROUPING = YES INLINE_GROUPED_CLASSES = NO INLINE_SIMPLE_STRUCTS = NO TYPEDEF_HIDES_STRUCT = NO -SYMBOL_CACHE_SIZE = 0 +#SYMBOL_CACHE_SIZE = 0 LOOKUP_CACHE_SIZE = 0 #--------------------------------------------------------------------------- # Build related configuration options @@ -230,8 +230,8 @@ MAN_LINKS = NO #--------------------------------------------------------------------------- GENERATE_XML = YES XML_OUTPUT = xml -XML_SCHEMA = -XML_DTD = +#XML_SCHEMA = +#XML_DTD = XML_PROGRAMLISTING = YES #--------------------------------------------------------------------------- # configuration options for the AutoGen Definitions output diff --git a/src/BuildAPI/CMakeLists.txt b/src/BuildAPI/CMakeLists.txt index 8e5aab018..dc2214086 100644 --- a/src/BuildAPI/CMakeLists.txt +++ b/src/BuildAPI/CMakeLists.txt @@ -88,6 +88,7 @@ SET(SWIG_LINK_LIBRARIES ModelAPI ${PYTHON_LIBRARIES} ) +SET(CMAKE_SWIG_FLAGS -threads -w325,321,302,362,322,383,403) SET(SWIG_MODULE_BuildAPI_EXTRA_DEPS ${SWIG_MODULE_BuildAPI_EXTRA_DEPS} ${PROJECT_SOURCE_DIR}/src/ModelHighAPI/ModelHighAPI.i diff --git a/src/CollectionAPI/CMakeLists.txt b/src/CollectionAPI/CMakeLists.txt index a29a97b96..0b2815bdd 100644 --- a/src/CollectionAPI/CMakeLists.txt +++ b/src/CollectionAPI/CMakeLists.txt @@ -57,6 +57,8 @@ TARGET_LINK_LIBRARIES(CollectionAPI ${PROJECT_LIBRARIES}) INCLUDE(PythonAPI) +SET(CMAKE_SWIG_FLAGS -threads -w325,321,302,362,322,383,403,509) + SET_SOURCE_FILES_PROPERTIES(CollectionAPI.i PROPERTIES CPLUSPLUS ON) SET_SOURCE_FILES_PROPERTIES(CollectionAPI.i PROPERTIES SWIG_DEFINITIONS "-shadow") diff --git a/src/Config/CMakeLists.txt b/src/Config/CMakeLists.txt index 0f9839976..d4d09b6a5 100644 --- a/src/Config/CMakeLists.txt +++ b/src/Config/CMakeLists.txt @@ -66,7 +66,7 @@ SET(PROJECT_SOURCES Config_Translator.cpp ) -SET(CMAKE_SWIG_FLAGS -threads -Wall) +SET(CMAKE_SWIG_FLAGS -threads -w321,401) SET_SOURCE_FILES_PROPERTIES(ConfigAPI.i PROPERTIES CPLUSPLUS ON) SET_SOURCE_FILES_PROPERTIES(ConfigAPI.i PROPERTIES SWIG_DEFINITIONS "-shadow") SET(SWIG_SCRIPTS diff --git a/src/ConnectorAPI/CMakeLists.txt b/src/ConnectorAPI/CMakeLists.txt index c604d3455..dabb5bdc3 100644 --- a/src/ConnectorAPI/CMakeLists.txt +++ b/src/ConnectorAPI/CMakeLists.txt @@ -73,6 +73,7 @@ SET(SWIG_MODULE_ConnectorAPI_EXTRA_DEPS ${SWIG_MODULE_ConnectorAPI_EXTRA_DEPS} doxyhelp.i ${PROJECT_HEADERS} ) +SET(CMAKE_SWIG_FLAGS -threads -w325,321,302,362,322,383,403) IF(${CMAKE_VERSION} VERSION_GREATER "3.8.0") SWIG_ADD_LIBRARY(ConnectorAPI LANGUAGE python SOURCES ConnectorAPI.i ${PROJECT_HEADERS}) diff --git a/src/ConstructionAPI/CMakeLists.txt b/src/ConstructionAPI/CMakeLists.txt index 751e21d34..3446bddee 100644 --- a/src/ConstructionAPI/CMakeLists.txt +++ b/src/ConstructionAPI/CMakeLists.txt @@ -72,6 +72,8 @@ SET(SWIG_LINK_LIBRARIES ${PYTHON_LIBRARIES} ) +SET(CMAKE_SWIG_FLAGS -threads -w325,321,302,362,322,383,403) + SET(SWIG_MODULE_ConstructionAPI_EXTRA_DEPS ${SWIG_MODULE_ConstructionAPI_EXTRA_DEPS} ${PROJECT_SOURCE_DIR}/src/ModelHighAPI/ModelHighAPI.i doxyhelp.i diff --git a/src/Events/CMakeLists.txt b/src/Events/CMakeLists.txt index 61fd28a06..1fd4485de 100644 --- a/src/Events/CMakeLists.txt +++ b/src/Events/CMakeLists.txt @@ -44,7 +44,7 @@ SET(PROJECT_SOURCES ADD_DEFINITIONS(-DEVENTS_EXPORTS) ADD_LIBRARY(Events SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS}) -SET(CMAKE_SWIG_FLAGS -threads -Wall) +SET(CMAKE_SWIG_FLAGS -threads -w362) SET_SOURCE_FILES_PROPERTIES(Events.i PROPERTIES CPLUSPLUS ON) SET_SOURCE_FILES_PROPERTIES(Events.i PROPERTIES SWIG_DEFINITIONS "-shadow") diff --git a/src/ExchangeAPI/CMakeLists.txt b/src/ExchangeAPI/CMakeLists.txt index 8cc29b806..9d3a4b868 100644 --- a/src/ExchangeAPI/CMakeLists.txt +++ b/src/ExchangeAPI/CMakeLists.txt @@ -58,6 +58,8 @@ TARGET_LINK_LIBRARIES(ExchangeAPI ${PROJECT_LIBRARIES}) INCLUDE(PythonAPI) +SET(CMAKE_SWIG_FLAGS -threads -w325,321,302,362,322,383,403) + SET_SOURCE_FILES_PROPERTIES(ExchangeAPI.i PROPERTIES CPLUSPLUS ON) SET_SOURCE_FILES_PROPERTIES(ExchangeAPI.i PROPERTIES SWIG_DEFINITIONS "-shadow") diff --git a/src/FeaturesAPI/CMakeLists.txt b/src/FeaturesAPI/CMakeLists.txt index 10702894a..23cdb1c47 100644 --- a/src/FeaturesAPI/CMakeLists.txt +++ b/src/FeaturesAPI/CMakeLists.txt @@ -112,6 +112,7 @@ SET(SWIG_LINK_LIBRARIES ModelAPI ${PYTHON_LIBRARIES} ) +SET(CMAKE_SWIG_FLAGS -threads -w325,321,302,362,322,383,403) SET(SWIG_MODULE_FeaturesAPI_EXTRA_DEPS ${SWIG_MODULE_FeaturesAPI_EXTRA_DEPS} ${PROJECT_SOURCE_DIR}/src/ModelHighAPI/ModelHighAPI.i diff --git a/src/GDMLAPI/CMakeLists.txt b/src/GDMLAPI/CMakeLists.txt index 19d9ed3de..bfd90c8b7 100644 --- a/src/GDMLAPI/CMakeLists.txt +++ b/src/GDMLAPI/CMakeLists.txt @@ -66,6 +66,7 @@ SET(SWIG_LINK_LIBRARIES ModelAPI ${PYTHON_LIBRARIES} ) +SET(CMAKE_SWIG_FLAGS -threads -w325,321,302,362,322,383,403) SET(SWIG_MODULE_GDMLAPI_EXTRA_DEPS ${SWIG_MODULE_GDMLAPI_EXTRA_DEPS} ${PROJECT_SOURCE_DIR}/src/ModelHighAPI/ModelHighAPI.i diff --git a/src/GeomAPI/CMakeLists.txt b/src/GeomAPI/CMakeLists.txt index a95efe2ce..92aecd7c4 100644 --- a/src/GeomAPI/CMakeLists.txt +++ b/src/GeomAPI/CMakeLists.txt @@ -123,7 +123,7 @@ SET(PROJECT_LIBRARIES ADD_DEFINITIONS(-DGEOMAPI_EXPORTS ${OpenCASCADE_DEFINITIONS}) ADD_LIBRARY(GeomAPI SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS}) -SET(CMAKE_SWIG_FLAGS -threads -Wall) +SET(CMAKE_SWIG_FLAGS -threads -w325,321,362,383,512) SET_SOURCE_FILES_PROPERTIES(GeomAPI.i PROPERTIES CPLUSPLUS ON) SET_SOURCE_FILES_PROPERTIES(GeomAPI.i PROPERTIES SWIG_DEFINITIONS "-shadow") diff --git a/src/GeomAlgoAPI/CMakeLists.txt b/src/GeomAlgoAPI/CMakeLists.txt index a886d6d05..baeacfbaa 100644 --- a/src/GeomAlgoAPI/CMakeLists.txt +++ b/src/GeomAlgoAPI/CMakeLists.txt @@ -150,7 +150,7 @@ SET(PROJECT_LIBRARIES ADD_DEFINITIONS(-DGEOMALGOAPI_EXPORTS ${OpenCASCADE_DEFINITIONS}) ADD_LIBRARY(GeomAlgoAPI SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS}) -SET(CMAKE_SWIG_FLAGS "-Wall") +SET(CMAKE_SWIG_FLAGS -w325,321,362,383,302) SET_SOURCE_FILES_PROPERTIES(GeomAlgoAPI.i PROPERTIES CPLUSPLUS ON) SET_SOURCE_FILES_PROPERTIES(GeomAlgoAPI.i PROPERTIES SWIG_DEFINITIONS "-shadow") diff --git a/src/GeomDataAPI/CMakeLists.txt b/src/GeomDataAPI/CMakeLists.txt index fe7c87d8c..fa7830d93 100644 --- a/src/GeomDataAPI/CMakeLists.txt +++ b/src/GeomDataAPI/CMakeLists.txt @@ -49,7 +49,7 @@ ADD_LIBRARY(GeomDataAPI SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS}) SET_TARGET_PROPERTIES(GeomDataAPI PROPERTIES LINKER_LANGUAGE CXX) TARGET_LINK_LIBRARIES(GeomDataAPI ${PROJECT_LIBRARIES}) -SET(CMAKE_SWIG_FLAGS "-Wall") +SET(CMAKE_SWIG_FLAGS -w325,321,362,383,302,403) SET_SOURCE_FILES_PROPERTIES(GeomDataAPI.i PROPERTIES CPLUSPLUS ON) SET_SOURCE_FILES_PROPERTIES(GeomDataAPI.i PROPERTIES SWIG_DEFINITIONS "-shadow") diff --git a/src/ModelAPI/CMakeLists.txt b/src/ModelAPI/CMakeLists.txt index 174b81404..18ebdcfc4 100644 --- a/src/ModelAPI/CMakeLists.txt +++ b/src/ModelAPI/CMakeLists.txt @@ -113,7 +113,7 @@ SET(PROJECT_LIBRARIES Config GeomAPI ) -SET(CMAKE_SWIG_FLAGS -threads -Wall) +SET(CMAKE_SWIG_FLAGS -threads -w325,321,362,383,302,403,473) ADD_DEFINITIONS(-DMODELAPI_EXPORTS) ADD_LIBRARY(ModelAPI SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS}) diff --git a/src/ModelGeomAlgo/CMakeLists.txt b/src/ModelGeomAlgo/CMakeLists.txt index 45fc4df8f..3791fd3da 100644 --- a/src/ModelGeomAlgo/CMakeLists.txt +++ b/src/ModelGeomAlgo/CMakeLists.txt @@ -41,7 +41,7 @@ SET(PROJECT_LIBRARIES ModelAPI ) -SET(CMAKE_SWIG_FLAGS -threads -Wall) +SET(CMAKE_SWIG_FLAGS -threads -w325,321,362,383,302,403) ADD_DEFINITIONS(-DMODELGEOMALGO_EXPORTS) ADD_LIBRARY(ModelGeomAlgo SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS}) diff --git a/src/ModelHighAPI/CMakeLists.txt b/src/ModelHighAPI/CMakeLists.txt index 680631379..04786ff11 100644 --- a/src/ModelHighAPI/CMakeLists.txt +++ b/src/ModelHighAPI/CMakeLists.txt @@ -93,6 +93,7 @@ set(SWIG_MODULE_ModelHighAPI_EXTRA_DEPS doxyhelp.i ${PROJECT_HEADERS} ) +SET(CMAKE_SWIG_FLAGS -threads -w325,321,302,362,322,383,403,509,503) IF(${CMAKE_VERSION} VERSION_GREATER "3.8.0") SWIG_ADD_LIBRARY(ModelHighAPI LANGUAGE python SOURCES ModelHighAPI.i ${PROJECT_HEADERS}) diff --git a/src/ParametersAPI/CMakeLists.txt b/src/ParametersAPI/CMakeLists.txt index 4d561918f..57619184f 100644 --- a/src/ParametersAPI/CMakeLists.txt +++ b/src/ParametersAPI/CMakeLists.txt @@ -57,6 +57,8 @@ TARGET_LINK_LIBRARIES(ParametersAPI ${PROJECT_LIBRARIES}) INCLUDE(PythonAPI) +SET(CMAKE_SWIG_FLAGS -threads -w325,321,302,362,322,383,403) + SET_SOURCE_FILES_PROPERTIES(ParametersAPI.i PROPERTIES CPLUSPLUS ON) SET_SOURCE_FILES_PROPERTIES(ParametersAPI.i PROPERTIES SWIG_DEFINITIONS "-shadow") diff --git a/src/PartSetAPI/CMakeLists.txt b/src/PartSetAPI/CMakeLists.txt index b5a4d2c68..ab1a62c7b 100644 --- a/src/PartSetAPI/CMakeLists.txt +++ b/src/PartSetAPI/CMakeLists.txt @@ -58,6 +58,8 @@ TARGET_LINK_LIBRARIES(PartSetAPI ${PROJECT_LIBRARIES}) INCLUDE(PythonAPI) +SET(CMAKE_SWIG_FLAGS -threads -w325,321,302,362,322,383,403) + SET_SOURCE_FILES_PROPERTIES(PartSetAPI.i PROPERTIES CPLUSPLUS ON) SET_SOURCE_FILES_PROPERTIES(PartSetAPI.i PROPERTIES SWIG_DEFINITIONS "-shadow") diff --git a/src/PrimitivesAPI/CMakeLists.txt b/src/PrimitivesAPI/CMakeLists.txt index 8a3673e8b..53b860925 100644 --- a/src/PrimitivesAPI/CMakeLists.txt +++ b/src/PrimitivesAPI/CMakeLists.txt @@ -72,6 +72,7 @@ SET(SWIG_LINK_LIBRARIES ModelAPI ${PYTHON_LIBRARIES} ) +SET(CMAKE_SWIG_FLAGS -threads -w325,321,302,362,322,383,403) SET(SWIG_MODULE_PrimitivesAPI_EXTRA_DEPS ${SWIG_MODULE_PrimitivesAPI_EXTRA_DEPS} ${PROJECT_SOURCE_DIR}/src/ModelHighAPI/ModelHighAPI.i diff --git a/src/SketchAPI/CMakeLists.txt b/src/SketchAPI/CMakeLists.txt index 37be6a336..80b055bed 100644 --- a/src/SketchAPI/CMakeLists.txt +++ b/src/SketchAPI/CMakeLists.txt @@ -89,6 +89,8 @@ TARGET_LINK_LIBRARIES(SketchAPI ${PROJECT_LIBRARIES}) INCLUDE(PythonAPI) +SET(CMAKE_SWIG_FLAGS -threads -w325,321,302,362,322,383,403) + SET_SOURCE_FILES_PROPERTIES(SketchAPI.i PROPERTIES CPLUSPLUS ON) SET_SOURCE_FILES_PROPERTIES(SketchAPI.i PROPERTIES SWIG_DEFINITIONS "-shadow") diff --git a/src/SketchSolver/PlaneGCSSolver/CMakeLists.txt b/src/SketchSolver/PlaneGCSSolver/CMakeLists.txt index c6f99cecd..7a961fcad 100644 --- a/src/SketchSolver/PlaneGCSSolver/CMakeLists.txt +++ b/src/SketchSolver/PlaneGCSSolver/CMakeLists.txt @@ -115,6 +115,9 @@ if(${SKETCHER_CHANGE_RADIUS_WHEN_MOVE}) ADD_DEFINITIONS(-DCHANGE_RADIUS_WHILE_MOVE) endif() +##ADD_DEFINITIONS(-Wno-deprecated -Wignored-attributes -Wmisleading-indentation -Wreorder) +ADD_DEFINITIONS(-w) + ADD_LIBRARY(PlaneGCSSolver MODULE ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${SKETCHSOLVER_TEXT_RESOURCES}) TARGET_LINK_LIBRARIES(PlaneGCSSolver ${PROJECT_LIBRARIES} ${SKETCHSOLVER_LIBRARIES}) INSTALL(TARGETS PlaneGCSSolver DESTINATION ${SHAPER_INSTALL_PLUGIN_FILES}) -- 2.30.2