From 9ed3b0da11363dcea58386f5eeafc64a84e1e30d Mon Sep 17 00:00:00 2001 From: admin Date: Thu, 7 Jun 2012 15:17:50 +0000 Subject: [PATCH] This commit was generated by cvs2git to create branch 'BR_DirectedBndBox'. Sprout from V6_main 2012-06-07 15:17:49 UTC ageay 'standardization of cmakization 2.' Cherrypick from V6_main 2012-06-05 11:55:41 UTC vsr 'Merge from V6_5_BR 05/06/2012': adm_local/cmake_files/FindMEDFILE.cmake adm_local/cmake_files/FindMETIS.cmake adm_local/cmake_files/FindPARMETIS.cmake adm_local/cmake_files/FindSCOTCH.cmake adm_local/cmake_files/FindXDR.cmake idl/CMakeLists.txt --- idl/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt index 21696efb5..9fcd6ceea 100644 --- a/idl/CMakeLists.txt +++ b/idl/CMakeLists.txt @@ -20,7 +20,7 @@ INCLUDE(${KERNEL_ROOT_DIR}/salome_adm/cmake_files/UseOMNIORB.cmake) INCLUDE_DIRECTORIES( - ${OMNIORB_INCLUDE_DIRS} + ${OMNIORB_INCLUDES_DIR} ${KERNEL_ROOT_DIR}/include/salome ${CMAKE_CURRENT_BINARY_DIR} ) @@ -48,10 +48,10 @@ SET(IDL_INCLUDE_DIRS OMNIORB_ADD_MODULE(SalomeIDLMED "${SalomeIDLMED_IDLSOURCES}" "${IDL_INCLUDE_DIRS}") TARGET_LINK_LIBRARIES(SalomeIDLMED ${CORBA_LIBS} ${KERNEL_LDFLAGS} ${SalomeIDLKernel}) -SET_TARGET_PROPERTIES(SalomeIDLMED PROPERTIES COMPILE_FLAGS "${OMNIORB_DEFINITIONS}") +SET_TARGET_PROPERTIES(SalomeIDLMED PROPERTIES COMPILE_FLAGS "${OMNIORB_FLAGS}") OMNIORB_ADD_MODULE(SalomeIDLMEDTests "${SalomeIDLMEDTests_IDLSOURCES}" "${IDL_INCLUDE_DIRS}") TARGET_LINK_LIBRARIES(SalomeIDLMEDTests ${CORBA_LIBS} ${KERNEL_LDFLAGS} ${SalomeIDLKernel}) -SET_TARGET_PROPERTIES(SalomeIDLMEDTests PROPERTIES COMPILE_FLAGS "${OMNIORB_DEFINITIONS}") +SET_TARGET_PROPERTIES(SalomeIDLMEDTests PROPERTIES COMPILE_FLAGS "${OMNIORB_FLAGS}") INSTALL(TARGETS SalomeIDLMED SalomeIDLMEDTests DESTINATION ${MED_salomelib_LIBS}) -- 2.39.2