From 3f74773037ae75c7f4eddf13086e4c97c339615f Mon Sep 17 00:00:00 2001 From: Viktor UZLOV Date: Thu, 28 Jan 2021 11:51:16 +0300 Subject: [PATCH] correct define SALOME_USE_64BIT_IDS --- SalomeKERNELConfig.cmake.in | 1 + src/Basics/CMakeLists.txt | 3 ++- src/Basics/{smIdType.hxx => smIdType.hxx.in} | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) rename src/Basics/{smIdType.hxx => smIdType.hxx.in} (97%) diff --git a/SalomeKERNELConfig.cmake.in b/SalomeKERNELConfig.cmake.in index c01f6fdf9..4d4ce7c00 100644 --- a/SalomeKERNELConfig.cmake.in +++ b/SalomeKERNELConfig.cmake.in @@ -66,6 +66,7 @@ SET(SALOME_KERNEL_BUILD_DOC @SALOME_BUILD_DOC@) SET(SALOME_KERNEL_BUILD_TESTS @SALOME_BUILD_TESTS@) SET(SALOME_KERNEL_LIGHT_ONLY @SALOME_LIGHT_ONLY@) SET(SALOME_USE_LIBBATCH @SALOME_USE_LIBBATCH@) +SET(SALOME_USE_64BIT_IDS @SALOME_USE_64BIT_IDS@) # Prerequisites: IF(SALOME_KERNEL_BUILD_TESTS) diff --git a/src/Basics/CMakeLists.txt b/src/Basics/CMakeLists.txt index 098b63b8a..8096bfe87 100644 --- a/src/Basics/CMakeLists.txt +++ b/src/Basics/CMakeLists.txt @@ -29,7 +29,6 @@ SET(SALOMEBasics_SOURCES BasicsGenericDestructor.hxx Basics_Utils.hxx Basics_DirUtils.hxx - smIdType.hxx ) ADD_LIBRARY(SALOMEBasics ${SALOMEBasics_SOURCES}) @@ -39,3 +38,5 @@ TARGET_LINK_LIBRARIES(SALOMEBasics ${PLATFORM_LIBS} ${PTHREAD_LIBRARIES}) FILE(GLOB SALOMEBasics_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx") INSTALL(FILES ${SALOMEBasics_HEADERS_HXX} DESTINATION ${SALOME_INSTALL_HEADERS}) + +SALOME_CONFIGURE_FILE(smIdType.hxx.in smIdType.hxx INSTALL ${SALOME_INSTALL_HEADERS}) \ No newline at end of file diff --git a/src/Basics/smIdType.hxx b/src/Basics/smIdType.hxx.in similarity index 97% rename from src/Basics/smIdType.hxx rename to src/Basics/smIdType.hxx.in index 5090b0456..b97de4a1f 100644 --- a/src/Basics/smIdType.hxx +++ b/src/Basics/smIdType.hxx.in @@ -23,6 +23,8 @@ #ifndef _SMIDTYPE_HXX_ #define _SMIDTYPE_HXX_ +#cmakedefine SALOME_USE_64BIT_IDS + #include #ifndef SALOME_USE_64BIT_IDS -- 2.39.2