Fix for #18930 [CEA][Windows] Compile ADAO on Windows: add the check that SalomeSetup...

diff --git a/cmake/FindSalomeMESHGEMS.cmake b/cmake/FindSalomeMESHGEMS.cmake
index 9acf05914bf436aa7467ebbf4491f368d8b796dc..9688a6dc5fec6cde73b24a3714892bd9e757580b 100644 (file)
--- a/cmake/FindSalomeMESHGEMS.cmake
+++ b/cmake/FindSalomeMESHGEMS.cmake
@@ -17,6 +17,10 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
+IF(NOT DEFINED MACHINE_IS_64)
+  MESSAGE(FATAL_ERROR "Developer error -> SalomeSetupPlatform macros should be inclided before find_package(SalomeMESHGEMS) !")
+ENDIF()
+
 SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(MESHGEMS MESHGEMS_INCLUDE_DIRS 1)
 MARK_AS_ADVANCED(MESHGEMS_INCLUDE_DIRS MESHGEMS_CADSURF_LIBRARY MESHGEMS_HEXA_LIBRARY MESHGEMS_HYBRID_LIBRARY MESHGEMS_TETRA_LIBRARY MESHGEMS_TETRA_HPC_LIBRARY)
 

diff --git a/cmake/FindSalomeOmniORB.cmake b/cmake/FindSalomeOmniORB.cmake
index dfb2e62659b0b996986b009d07f7a927d3571ebc..320cbb13b51b66c6366bae7d34dad77eae50ffcf 100644 (file)
--- a/cmake/FindSalomeOmniORB.cmake
+++ b/cmake/FindSalomeOmniORB.cmake
@@ -23,6 +23,12 @@
 #
 #  !! Please read the generic detection procedure in SalomeMacros.cmake !!
 #
+IF(WIN32)
+  IF(NOT DEFINED SIZEOF_LONG)
+    MESSAGE(FATAL_ERROR "Developer error -> SalomeSetupPlatform macros should be inclided before find_package(SalomeOmniORB) !")
+  ENDIF()
+ENDIF()
+
 SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(OmniORB OMNIORB_INCLUDE_DIR 1)
 #MARK_AS_ADVANCED()
 

diff --git a/cmake/FindSalomeTBB.cmake b/cmake/FindSalomeTBB.cmake
index 48b55b1e03ac67bc118f46d3ddebaa90ff283841..8331f2f0942aa5a9a258384e57732e7b55d95fe0 100644 (file)
--- a/cmake/FindSalomeTBB.cmake
+++ b/cmake/FindSalomeTBB.cmake
@@ -17,6 +17,10 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
+IF(NOT DEFINED MACHINE_IS_64)
+  MESSAGE(FATAL_ERROR "Developer error -> SalomeSetupPlatform macros should be inclided before find_package(SalomeTBB) !")
+ENDIF()
+
 SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(TBB TBB_INCLUDE_DIRS 1)
 
 IF(TBB_INCLUDE_DIRS AND TBB_LIBRARIES)