multistudy removal part 1

[modules/hydro.git] / CMake / Common.cmake

diff --git a/CMake/Common.cmake b/CMake/Common.cmake
index 29f6e2241aa301f052916a50918b3b3c69dc7b90..7b4f7d99df3dff8b7b8d591f5292f9fd9c0012f4 100644 (file)
--- a/CMake/Common.cmake
+++ b/CMake/Common.cmake
@@ -1,8 +1,13 @@
 cmake_minimum_required (VERSION 2.6)
 cmake_policy(SET CMP0011 NEW)
 
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib/salome)
+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()