From 3c3c62f13e3f453ed7c11ade8ab0072829e9faf1 Mon Sep 17 00:00:00 2001 From: vsr Date: Wed, 6 Mar 2013 13:56:07 +0000 Subject: [PATCH] Merge from V6_main 06/03/2013 --- salome_adm/cmake_files/deprecated/am2cmake.py | 6 ++++++ src/SALOMEDS/Test/CMakeLists.txt | 2 +- src/SALOMEDSImpl/Test/CMakeLists.txt | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/salome_adm/cmake_files/deprecated/am2cmake.py b/salome_adm/cmake_files/deprecated/am2cmake.py index ba583ed90..f33a510bc 100644 --- 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 32247f24b..cc4c1dce6 100755 --- 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 112f533ed..2b1c63a1a 100755 --- 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 -- 2.39.2