From: ageay Date: Wed, 10 Jul 2013 06:16:43 +0000 (+0000) Subject: Correction of Renaud. X-Git-Tag: B4KillOfAutomake~35 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=76dd406ff917b992f4ec8bd22bf0963dd20857a1;p=modules%2Fmed.git Correction of Renaud. --- diff --git a/adm_local/cmake_files/FindScotch.cmake b/adm_local/cmake_files/FindScotch.cmake index e1657416f..89c345d49 100644 --- a/adm_local/cmake_files/FindScotch.cmake +++ b/adm_local/cmake_files/FindScotch.cmake @@ -29,7 +29,7 @@ ENDIF(SCOTCH_ROOT_DIR) FIND_LIBRARY(SCOTCH_LIBRARIES scotch) FIND_LIBRARY(SCOTCH_ERR_LIBRARIES scotcherr) SET(SCOTCH_LIBRARIES ${SCOTCH_LIBRARIES} ${SCOTCH_ERR_LIBRARIES}) -FIND_PATH(SCOTCH_INCLUDE_DIRS scotch.h) +FIND_PATH(SCOTCH_INCLUDE_DIRS scotch.h PATH_SUFFIXES "/scotch") INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(Scotch REQUIRED_VARS SCOTCH_INCLUDE_DIRS SCOTCH_LIBRARIES) diff --git a/src/MEDOP/gui/CMakeLists.txt b/src/MEDOP/gui/CMakeLists.txt index 6a773cb49..a87be7865 100644 --- a/src/MEDOP/gui/CMakeLists.txt +++ b/src/MEDOP/gui/CMakeLists.txt @@ -53,8 +53,8 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR}/dialogs ${CMAKE_CURRENT_SOURCE_DIR}/../cmp ${CMAKE_CURRENT_SOURCE_DIR}/../../MEDGUI - ${CMAKE_PROJECT_DIR}/idl - ${CMAKE_PROJECT_DIR} + ${PROJECT_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR} ) SET(MEDOPGUITS_SOURCES