Merge from V6_main 06/03/2013

diff --git a/salome_adm/cmake_files/deprecated/am2cmake.py b/salome_adm/cmake_files/deprecated/am2cmake.py
index ba583ed903200237fd4b3a9ac4dd22bb3b6dc2e0..f33a510bc44a59e78bca584408c8a4bcf74c699c 100644 (file)
--- a/salome_adm/cmake_files/deprecated/am2cmake.py
+++ b/salome_adm/cmake_files/deprecated/am2cmake.py
@@ -679,6 +679,7 @@ class CMakeFile(object):
                 newlines.append("""
                 IF(WINDOWS)
                 SET(CPPUNIT_IS_OK 0)
+                MESSAGE(STATUS "cppunit is disabled.")
                 ENDIF(WINDOWS)
                 """)
                 pass
@@ -1968,6 +1969,11 @@ class CMakeFile(object):
         SET(vars ${vars} -ftemplate-depth-32)
         SET(vars ${vars} -fPIC)
         SET(vars ${vars} -g)
+        IF("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")          # if platform is Windows 64 bit 
+        IF(name STREQUAL _pilot)
+        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")    # to avoid error C1128
+        ENDIF(name STREQUAL _pilot)
+        ENDIF("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
         ENDIF(WINDOWS)
         SET(flags)
         FOREACH(f ${var})

diff --git a/src/SALOMEDS/Test/CMakeLists.txt b/src/SALOMEDS/Test/CMakeLists.txt
index 32247f24bfb32845b34befeaa42cfd9ba86bb770..cc4c1dce6efe02df36c8024d0fbad5dbc1892cda 100755 (executable)
--- a/src/SALOMEDS/Test/CMakeLists.txt
+++ b/src/SALOMEDS/Test/CMakeLists.txt
@@ -20,7 +20,7 @@
 INCLUDE_DIRECTORIES(
   ${CPPUNIT_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
-  ${BOOST_INCLUDE_DIRS}
+  ${Boost_INCLUDE_DIRS}
   ${CMAKE_BINARY_DIR}/salome_adm
   ${CMAKE_CURRENT_SOURCE_DIR}/../../Basics
   ${CMAKE_CURRENT_SOURCE_DIR}/../../Basics/Test

diff --git a/src/SALOMEDSImpl/Test/CMakeLists.txt b/src/SALOMEDSImpl/Test/CMakeLists.txt
index 112f533edcf9a536e3f44fd30bd02ab4f4725dae..2b1c63a1a61864a70127bca928560c3aee419c39 100755 (executable)
--- a/src/SALOMEDSImpl/Test/CMakeLists.txt
+++ b/src/SALOMEDSImpl/Test/CMakeLists.txt
@@ -20,7 +20,7 @@
 INCLUDE_DIRECTORIES(
   ${CPPUNIT_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
-  ${BOOST_INCLUDE_DIRS}
+  ${Boost_INCLUDE_DIRS}
   ${CMAKE_CURRENT_SOURCE_DIR}/../../Basics
   ${CMAKE_CURRENT_SOURCE_DIR}/../../Basics/Test
   ${CMAKE_CURRENT_SOURCE_DIR}/../../SALOMELocalTrace