Code improvements

diff --git a/src/ConstructionAPI/CMakeLists.txt b/src/ConstructionAPI/CMakeLists.txt
index 83dbc2dd239863a63ae850e3db6729bbb340b97b..8faa88b4397e00a79f203709380149d82dd7c949 100644 (file)
--- a/src/ConstructionAPI/CMakeLists.txt
+++ b/src/ConstructionAPI/CMakeLists.txt
@@ -11,16 +11,16 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 SET(PROJECT_HEADERS
     ConstructionAPI.h
     ConstructionAPI_Point.h
-)
+    )
 
 SET(PROJECT_SOURCES
     ConstructionAPI_Point.cpp
-)
+    )
 
 SET(PROJECT_LIBRARIES
     ModelAPI
     ModelHighAPI
-)
+    )
 
 ADD_DEFINITIONS(-DCONSTRUCTIONAPI_EXPORTS ${CAS_DEFINITIONS})
 ADD_LIBRARY(ConstructionAPI SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS})
@@ -31,22 +31,22 @@ SET_SOURCE_FILES_PROPERTIES(ConstructionAPI.i PROPERTIES CPLUSPLUS ON)
 SET_SOURCE_FILES_PROPERTIES(ConstructionAPI.i PROPERTIES SWIG_DEFINITIONS "-shadow")
 
 INCLUDE_DIRECTORIES(
-  ${PROJECT_SOURCE_DIR}/src/ModelAPI
-  ${PROJECT_SOURCE_DIR}/src/ModelHighAPI
-)
+    ${PROJECT_SOURCE_DIR}/src/ModelAPI
+    ${PROJECT_SOURCE_DIR}/src/ModelHighAPI
+    )
 
 TARGET_LINK_LIBRARIES(ConstructionAPI ${PROJECT_LIBRARIES})
 
 SET(SWIG_SCRIPTS
-  ${CMAKE_CURRENT_BINARY_DIR}/ConstructionAPI.py
-)
+    ${CMAKE_CURRENT_BINARY_DIR}/ConstructionAPI.py
+    )
 
 SET(SWIG_LINK_LIBRARIES
-  ConstructionAPI
-  ModelHighAPI
-  ModelAPI
-  ${PYTHON_LIBRARIES}
-)
+    ConstructionAPI
+    ModelHighAPI
+    ModelAPI
+    ${PYTHON_LIBRARIES}
+    )
 
 SET(SWIG_MODULE_ConstructionAPI_EXTRA_DEPS ${SWIG_MODULE_ConstructionAPI_EXTRA_DEPS}
     ${PROJECT_SOURCE_DIR}/src/ModelHighAPI/ModelHighAPI.i

diff --git a/src/ConstructionAPI/ConstructionAPI_swig.h b/src/ConstructionAPI/ConstructionAPI_swig.h
index cade6c2c7c11d05d932ab5d463cee1d9e6cccc75..4cdc3fb817cb261e8cb76df6527c630d02a9ee6e 100644 (file)
--- a/src/ConstructionAPI/ConstructionAPI_swig.h
+++ b/src/ConstructionAPI/ConstructionAPI_swig.h
@@ -7,9 +7,8 @@
 #ifndef SRC_CONSTRUCTIONAPI_CONSTRUCTIONAPI_SWIG_H_
 #define SRC_CONSTRUCTIONAPI_CONSTRUCTIONAPI_SWIG_H_
 
-  #include "ModelHighAPI_swig.h"
+  #include <ModelHighAPI_swig.h>
 
-  #include "ConstructionAPI.h"
   #include "ConstructionAPI_Point.h"
 
 #endif /* SRC_CONSTRUCTIONAPI_CONSTRUCTIONAPI_SWIG_H_ */

diff --git a/src/ModelHighAPI/ModelHighAPI_swig.h b/src/ModelHighAPI/ModelHighAPI_swig.h
index d4cf88b650d404aa65c804a3a95ecdb6fd1711f5..63b3b1b43de664282d19f2457a3e9e474a7d0f09 100644 (file)
--- a/src/ModelHighAPI/ModelHighAPI_swig.h
+++ b/src/ModelHighAPI/ModelHighAPI_swig.h
@@ -9,7 +9,6 @@
 
   #include <ModelAPI.h>
 
-  #include "ModelHighAPI.h"
   #include "ModelHighAPI_Double.h"
   #include "ModelHighAPI_Interface.h"