From: rnv <rnv@opencascade.com>
Date: Thu, 24 Oct 2013 08:03:52 +0000 (+0000)
Subject: Fix compilation on WIN32 platform: call FIND_PACKAGE after SalomeSetupPlatform.
X-Git-Tag: V7_3_0a1~65
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=4f0c02463156617d681e23340d5cff7da3ad968e;p=modules%2Fmed.git

Fix compilation on WIN32 platform: call FIND_PACKAGE after SalomeSetupPlatform.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a83242507..80630db8b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)