From: rnv Date: Mon, 24 Jun 2013 08:19:09 +0000 (+0000) Subject: Preparation of the SALOME7.2.0 win32 version. X-Git-Tag: V7_2_0_WIN~8 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=dcaac101bb700e0a8c5ffe62bdd4225987b58d45;p=modules%2Fkernel.git Preparation of the SALOME7.2.0 win32 version. --- diff --git a/salome_adm/cmake_files/deprecated/FindOMNIORB.cmake b/salome_adm/cmake_files/deprecated/FindOMNIORB.cmake index 64599d1bf..f14adaee7 100644 --- a/salome_adm/cmake_files/deprecated/FindOMNIORB.cmake +++ b/salome_adm/cmake_files/deprecated/FindOMNIORB.cmake @@ -65,8 +65,13 @@ ENDIF(OMNIORB_STATUS) IF(OMNIORB_STATUS) SET(OMNIIDL_EXECUTABLE_TO_FIND omniidl) + IF(WINDOWS) + SET( FIND_PATH ${OMNIORB_ROOT_USER}/bin/x86_win32) + ELSE(WINDOWS) + SET( FIND_PATH ${OMNIORB_ROOT_USER}/bin) + ENDIF(WINDOWS) IF(OMNIORB_ROOT_USER) - FIND_PROGRAM(OMNIIDL_EXECUTABLE ${OMNIIDL_EXECUTABLE_TO_FIND} PATHS ${OMNIORB_ROOT_USER}/bin) + FIND_PROGRAM(OMNIIDL_EXECUTABLE ${OMNIIDL_EXECUTABLE_TO_FIND} PATHS ${FIND_PATH} ) ELSE(OMNIORB_ROOT_USER) FIND_PROGRAM(OMNIIDL_EXECUTABLE ${OMNIIDL_EXECUTABLE_TO_FIND}) ENDIF(OMNIORB_ROOT_USER)