From: vsr <vsr@opencascade.com>
Date: Fri, 9 Oct 2020 09:59:36 +0000 (+0300)
Subject: Default value for MEDCOUPLING_USE_64BIT_IDS option is automatically set from med_int... 
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=1839723cd7b4f44028f873aaa0cb120bff5ee87c;p=tools%2Fmedcoupling.git

Default value for MEDCOUPLING_USE_64BIT_IDS option is automatically set from med_int size
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 83db58ac8..350732d0a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -83,7 +83,6 @@ OPTION(MEDCOUPLING_USE_MPI "(Use MPI containers) - For MED this triggers the bui
 OPTION(MEDCOUPLING_BUILD_TESTS "Build MED tests." ON)
 OPTION(MEDCOUPLING_BUILD_DOC "Build MED doc." ON)
 OPTION(MEDCOUPLING_BUILD_STATIC "Build MEDCoupling library in static mode." OFF)
-OPTION(MEDCOUPLING_USE_64BIT_IDS "Size of IDs to refer cells and nodes. 32 bits when OFF (default), 64 bits when ON." OFF)
 
 IF(${MEDCOUPLING_USE_MPI})
   SET(USE_METIS_NOT_PARMETIS OFF)
@@ -125,11 +124,6 @@ ENDIF()
 # Set list of prerequisites
 # =========================
 
-set(MEDCOUPLING_USE_64BIT_IDS_CPP_DEFINE)
-if(MEDCOUPLING_USE_64BIT_IDS)
-  set(MEDCOUPLING_USE_64BIT_IDS_CPP_DEFINE "#define MEDCOUPLING_USE_64BIT_IDS")
-endif(MEDCOUPLING_USE_64BIT_IDS)
-
 IF(NOT MEDCOUPLING_MICROMED)
   FIND_PACKAGE(SalomeHDF5 REQUIRED)
   FIND_PACKAGE(SalomeMEDFile REQUIRED)
@@ -158,8 +152,15 @@ IF(NOT MEDCOUPLING_MICROMED)
   ENDIF(MEDCOUPLING_ENABLE_PARTITIONER)
 ENDIF(NOT MEDCOUPLING_MICROMED)
 
+OPTION(MEDCOUPLING_USE_64BIT_IDS "Size of IDs to refer cells and nodes. 32 bits when OFF (default), 64 bits when ON." ${MED_INT_IS_LONG})
+
 ENABLE_TESTING() # let it outsite because even if MEDCOUPLING_BUILD_TESTS is OFF, python tests that not need additional compilation can be run.
 
+set(MEDCOUPLING_USE_64BIT_IDS_CPP_DEFINE)
+if(MEDCOUPLING_USE_64BIT_IDS)
+  set(MEDCOUPLING_USE_64BIT_IDS_CPP_DEFINE "#define MEDCOUPLING_USE_64BIT_IDS")
+endif(MEDCOUPLING_USE_64BIT_IDS)
+
 IF(MEDCOUPLING_BUILD_TESTS)
   FIND_PACKAGE(SalomeCppUnit)
   SALOME_LOG_OPTIONAL_PACKAGE(CppUnit SALOME_BUILD_TESTS)