From 017e69c8531a6a8d2b0d696848a209ce73e15cbf Mon Sep 17 00:00:00 2001 From: eap Date: Wed, 26 Jun 2013 12:50:55 +0000 Subject: [PATCH] Roll back the previous modif --- salome_adm/cmake_files/FindOmniORB.cmake | 42 +++++------------------- 1 file changed, 8 insertions(+), 34 deletions(-) diff --git a/salome_adm/cmake_files/FindOmniORB.cmake b/salome_adm/cmake_files/FindOmniORB.cmake index acdb2ac35..e43909d2e 100644 --- a/salome_adm/cmake_files/FindOmniORB.cmake +++ b/salome_adm/cmake_files/FindOmniORB.cmake @@ -50,14 +50,7 @@ ENDIF() ############################################################################## # find headers ############################################################################## -IF (WIN32) - FIND_PATH(OMNIORB_INCLUDE_DIR omniORB4/CORBA.h) -ELSE (WIN32) - FIND_PATH(OMNIORB_INCLUDE_DIR omniORB4/CORBA.h - PATHS "${OMNIORB_DIR}/include" "$ENV{OMNIORB_DIR}/include" - NO_DEFAULT_PATH) - FIND_PATH(OMNIORB_INCLUDE_DIR omniORB4/CORBA.h) -ENDIF() +FIND_PATH(OMNIORB_INCLUDE_DIR omniORB4/CORBA.h) ############################################################################## # find libraries @@ -70,19 +63,11 @@ IF (WIN32) FIND_LIBRARY( OMNIORB_LIBRARY_omniDynamic4 NAMES ${CMAKE_STATIC_LIBRARY_PREFIX}omniDynamic4${CMAKE_STATIC_LIBRARY_SUFFIX}) ELSE (WIN32) - FIND_LIBRARY(OMNIORB_LIBRARY_omniORB4 NAMES omniORB4 - PATHS "${OMNIORB_DIR}/lib${LIB_SUFFIX}" "$ENV{OMNIORB_DIR}/lib${LIB_SUFFIX}" - NO_DEFAULT_PATH) - FIND_LIBRARY(OMNIORB_LIBRARY_omniORB4 NAMES omnithread) - - #the rest libraries must be at the same PATH as omniORB4 - GET_FILENAME_COMPONENT(OMNIORB_LIBRARY_PATH ${OMNIORB_LIBRARY_omniORB4} PATH) - FIND_LIBRARY(OMNIORB_LIBRARY_omnithread NAMES omnithread - PATHS "${OMNIORB_LIBRARY_PATH}" NO_DEFAULT_PATH) - FIND_LIBRARY(OMNIORB_LIBRARY_omniDynamic4 NAMES omniDynamic4 - PATHS "${OMNIORB_LIBRARY_PATH}" NO_DEFAULT_PATH) + FIND_LIBRARY(OMNIORB_LIBRARY_omniORB4 NAMES omniORB4) + FIND_LIBRARY(OMNIORB_LIBRARY_omnithread NAMES omnithread) + FIND_LIBRARY(OMNIORB_LIBRARY_omniDynamic4 NAMES omniDynamic4) ENDIF (WIN32) - + # Optional libraries IF (WIN32) @@ -91,10 +76,8 @@ IF (WIN32) FIND_LIBRARY( OMNIORB_LIBRARY_COSDynamic4 NAMES ${CMAKE_STATIC_LIBRARY_PREFIX}COSDynamic4${CMAKE_STATIC_LIBRARY_SUFFIX}) ELSE (WIN32) - FIND_LIBRARY(OMNIORB_LIBRARY_COS4 NAMES COS4 - PATHS "${OMNIORB_LIBRARY_PATH}" NO_DEFAULT_PATH) - FIND_LIBRARY(OMNIORB_LIBRARY_COSDynamic4 NAMES COSDynamic4 - PATHS "${OMNIORB_LIBRARY_PATH}" NO_DEFAULT_PATH) + FIND_LIBRARY(OMNIORB_LIBRARY_COS4 NAMES COS4) + FIND_LIBRARY(OMNIORB_LIBRARY_COSDynamic4 NAMES COSDynamic4) ENDIF (WIN32) ############################################################################## @@ -108,13 +91,7 @@ IF (WIN32) NAMES omniNames PATHS bin/x86_win32 DOC "What is the path where omniNames (the ORB server) can be found") ELSE(WIN32) - FIND_PROGRAM(OMNIORB_IDL_COMPILER NAMES omniidl - PATHS "${OMNIORB_DIR}/bin" "$ENV{OMNIORB_DIR}/bin" - NO_DEFAULT_PATH) FIND_PROGRAM(OMNIORB_IDL_COMPILER NAMES omniidl) - FIND_PROGRAM(OMNIORB_NAMESERVER NAMES omniNames - PATHS "${OMNIORB_DIR}/bin" "$ENV{OMNIORB_DIR}/bin" - NO_DEFAULT_PATH) FIND_PROGRAM(OMNIORB_NAMESERVER NAMES omniNames) ENDIF (WIN32) @@ -131,10 +108,7 @@ IF(WIN32) ELSE() FIND_PATH(OMNIORB_PYTHON_BACKEND NAMES __init__.py - PATHS - "${OMNIORB_DIR}/lib/python${_py_version}/site-packages/omniidl_be" - "$ENV{OMNIORB_DIR}/lib/python${_py_version}/site-packages/omniidl_be" - "/usr/lib/omniidl/omniidl_be" + PATHS "/lib/python${_py_version}/site-packages/omniidl_be" "/usr/lib/omniidl/omniidl_be" DOC ${_doc}) ENDIF() -- 2.39.2