multi-processors compilation

diff --git a/CMake/Common.cmake b/CMake/Common.cmake
index ceefd5bed88bf6d7b55bbe5a517df8fea38fec75..7b4f7d99df3dff8b7b8d591f5292f9fd9c0012f4 100644 (file)
--- a/CMake/Common.cmake
+++ b/CMake/Common.cmake
@@ -6,3 +6,8 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib/salome)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin/salome)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
+
+IF( MSVC )
+  set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP" )
+  message(STATUS "Added parallel build arguments to CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}")
+ENDIF()

diff --git a/src/HYDROData/CMakeLists.txt b/src/HYDROData/CMakeLists.txt
index 9addb41b163e02a40b0850a8bd4cef682ee17833..b8a2544254d74d3860a8458fab1c9278035f5a93 100644 (file)
--- a/src/HYDROData/CMakeLists.txt
+++ b/src/HYDROData/CMakeLists.txt
@@ -1,4 +1,4 @@
-#include(../../CMake/Common.cmake)
+include(../../CMake/Common.cmake)
 
 set(PROJECT_HEADERS
     HYDROData.h
@@ -129,8 +129,6 @@ add_definitions(
 include_directories(
   ${CAS_INCLUDE_DIRS}
   ${QT_INCLUDES}
-  ${CMAKE_CURRENT_SOURCE_DIR}
-#  ${GUI_ROOT_DIR}/include/salome
   ${GUI_INCLUDE_DIRS}
   ${CMAKE_CURRENT_SOURCE_DIR}/../shapelib
 )

diff --git a/src/HYDROGUI/CMakeLists.txt b/src/HYDROGUI/CMakeLists.txt
index 769496f8b668a9499093b7b55d233b7b44b6145e..ae5ef8328f34bfe0d7893607d28bb29c74ad672b 100644 (file)
--- a/src/HYDROGUI/CMakeLists.txt
+++ b/src/HYDROGUI/CMakeLists.txt
@@ -1,4 +1,4 @@
-#include(../../CMake/Common.cmake)
+include(../../CMake/Common.cmake)
 include(../../CMake/UseQT4EXT.cmake)
  
 set(PROJECT_HEADERS 
@@ -289,11 +289,8 @@ add_definitions(
 include_directories(
   ${CAS_INCLUDE_DIRS}
   ${QT_INCLUDES}
-#  ${GUI_ROOT_DIR}/include/salome
   ${GUI_INCLUDE_DIRS}
-#  ${GEOM_ROOT_DIR}/include/salome
   ${GEOM_INCLUDE_DIRS}
-  ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/../shapelib
   ${CMAKE_CURRENT_SOURCE_DIR}/../HYDROData
   ${VTK_INCLUDE_DIRS}

diff --git a/src/HYDROPy/CMakeLists.txt b/src/HYDROPy/CMakeLists.txt
index 0a74efeed2539f9afab0b177490ad56402194785..d91a58346f9a9aa5efe9b2e18da95f547db65a91 100644 (file)
--- a/src/HYDROPy/CMakeLists.txt
+++ b/src/HYDROPy/CMakeLists.txt
@@ -1,4 +1,4 @@
-
+include(../../CMake/Common.cmake)
 include(../../CMake/UsePyQt4EXT.cmake)
 
 # --- options ---

diff --git a/src/HYDRO_tests/CMakeLists.txt b/src/HYDRO_tests/CMakeLists.txt
index 9437e76295b88ff6e64dcbd841e34c9198e2fba7..cdd7357306283450211d84aa9e3ddc085ba4162c 100644 (file)
--- a/src/HYDRO_tests/CMakeLists.txt
+++ b/src/HYDRO_tests/CMakeLists.txt
@@ -1,7 +1,7 @@
+include(../../CMake/Common.cmake)
 include(ExternalFiles.cmake)
 
 set(PROJECT_HEADERS
-  operators.h
   test_HYDROData_Bathymetry.h
   test_HYDROData_Document.h
   test_HYDROData_Entity.h
@@ -65,7 +65,6 @@ include_directories(
   ${QT_INCLUDES}
   ${CPPUNIT_INCLUDES}
   ${GUI_INCLUDES}
-  ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/../HYDROData
   ${CMAKE_CURRENT_SOURCE_DIR}/../HYDROGUI
   ${CMAKE_CURRENT_SOURCE_DIR}/../shapelib

diff --git a/src/HYDRO_tests/operators.h b/src/HYDRO_tests/operators.h
deleted file mode 100644 (file)
index ebc16d7..0000000
--- a/src/HYDRO_tests/operators.h
+++ /dev/null
@@ -1,5 +0,0 @@
-
-#pragma once
-
-std::ostream& operator<<( std::ostream& theStream, const QString& theText );
-std::ostream& operator<<( std::ostream& theStream, const QColor& theText );
\ No newline at end of file

diff --git a/src/shapelib/CMakeLists.txt b/src/shapelib/CMakeLists.txt
index d286d2ccb9d670a5b76e83e9fb1d4c01b25c8ac5..419c3c4c6b548bf4ac0b87efb7279667d21cd409 100644 (file)
--- a/src/shapelib/CMakeLists.txt
+++ b/src/shapelib/CMakeLists.txt
@@ -24,4 +24,3 @@ INSTALL(TARGETS shapelib EXPORT ${PROJECT_NAME}TargetGroup DESTINATION ${SALOME_
 
 set(PROJECT_LIBRARIES shapelib)
 
-#include(../../CMake/CommonInstall.cmake)