From: ana Date: Tue, 20 Mar 2012 12:00:07 +0000 (+0000) Subject: Bug IPAL22865 "Re-structurization of Partition-related packges in SALOME GEOM module" X-Git-Tag: V6_5_0a1~24 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=915fa86d2906d542a26ee4aa1720cd489c3bbdbe;p=modules%2Fkernel.git Bug IPAL22865 "Re-structurization of Partition-related packges in SALOME GEOM module" Win32 compilation --- diff --git a/salome_adm/cmake_files/am2cmake.py b/salome_adm/cmake_files/am2cmake.py index e7f0e2dad..f5b921d6c 100644 --- a/salome_adm/cmake_files/am2cmake.py +++ b/salome_adm/cmake_files/am2cmake.py @@ -302,6 +302,7 @@ class CMakeFile(object): "EntityGUI", "GenerationGUI", "GEOMAlgo", + "GEOMAlgo_NEW", "GEOMArchimede", "GEOMBase", "GEOMbasic", @@ -320,7 +321,9 @@ class CMakeFile(object): "MeasureGUI", "Material", "NMTDS", + "NMTDS_NEW", "NMTTools", + "NMTTools_NEW", "OCC2VTK", "OperationGUI", "PrimitiveGUI", @@ -592,6 +595,17 @@ class CMakeFile(object): pass if self.module == "geom": newlines.append(""" + IF(OCC_VERSION_DEVELOPMENT) + SET(NMTDS_VAR NMTDS_NEW) + SET(NMTTools_VAR NMTTools_NEW) + SET(GEOMAlgo_VAR GEOMAlgo_NEW) + ELSE(OCC_VERSION_DEVELOPMENT) + SET(NMTDS_VAR NMTDS) + SET(NMTTools_VAR NMTTools) + SET(GEOMAlgo_VAR GEOMAlgo) + + ENDIF(OCC_VERSION_DEVELOPMENT) + INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/FindSPHINX.cmake) """) pass