]> SALOME platform Git repositories - modules/med.git/commitdiff
Salome HOME
Fix compilation on WIN32 platform: call FIND_PACKAGE after SalomeSetupPlatform.
authorrnv <rnv@opencascade.com>
Thu, 24 Oct 2013 08:03:52 +0000 (08:03 +0000)
committerrnv <rnv@opencascade.com>
Thu, 24 Oct 2013 08:03:52 +0000 (08:03 +0000)
CMakeLists.txt

index a83242507fcea6b86ffaf45796ef6ea8f55c71dc..80630db8bc497c5f4eb1109c8fef059acfed1b2e 100644 (file)
@@ -56,13 +56,19 @@ IF(NOT SALOME_MED_STANDALONE)
     MESSAGE(FATAL_ERROR "We absolutely need a Salome KERNEL, please define KERNEL_ROOT_DIR or turn option SALOME_MED_STANDALONE to ON !")
   ENDIF(EXISTS ${KERNEL_ROOT_DIR})
   LIST(APPEND CMAKE_MODULE_PATH "${KERNEL_ROOT_DIR}/salome_adm/cmake_files")
-  FIND_PACKAGE(SalomePThread REQUIRED) # for MEDCouplingCorba/Test for EDF
-  FIND_PACKAGE(SalomeOmniORB REQUIRED)
 ELSE(NOT SALOME_MED_STANDALONE)
   LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/adm_local_without_kernel/cmake_files")
   INCLUDE(SalomeMacros)
 ENDIF(NOT SALOME_MED_STANDALONE)
 
+# Platform setup
+# ==============
+INCLUDE(SalomeSetupPlatform)
+
+IF(NOT SALOME_MED_STANDALONE)
+  FIND_PACKAGE(SalomePThread REQUIRED) # for MEDCouplingCorba/Test for EDF
+  FIND_PACKAGE(SalomeOmniORB REQUIRED)
+ENDIF(NOT SALOME_MED_STANDALONE)
 #
 # User options
 # ============
@@ -105,10 +111,6 @@ ELSE(NOT SALOME_MED_STANDALONE)
   INCLUDE(SalomeMacros)
 ENDIF(NOT SALOME_MED_STANDALONE)
 
-# Platform setup
-# ==============
-INCLUDE(SalomeSetupPlatform)
-
 IF(NOT SALOME_MED_MICROMED)
   FIND_PACKAGE(SalomeHDF5 REQUIRED)
   FIND_PACKAGE(SalomeMEDFile REQUIRED)