From: ageay Date: Tue, 9 Jul 2013 15:13:57 +0000 (+0000) Subject: SOURCE -> PROJECT X-Git-Tag: V7_3_1b1~347 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=8c4619af1fed13743ce88eeed3216ca0497378d8;p=tools%2Fmedcoupling.git SOURCE -> PROJECT --- diff --git a/src/MEDCoupling_Swig/CMakeLists.txt b/src/MEDCoupling_Swig/CMakeLists.txt index d8859f7f6..155412702 100644 --- a/src/MEDCoupling_Swig/CMakeLists.txt +++ b/src/MEDCoupling_Swig/CMakeLists.txt @@ -36,7 +36,6 @@ INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIRS} # pthread dependancy due to python2.7 library ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../MEDCoupling ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL/Bases diff --git a/src/MEDOP/cmp/CMakeLists.txt b/src/MEDOP/cmp/CMakeLists.txt index 8cdc7bbae..a2801b36d 100644 --- a/src/MEDOP/cmp/CMakeLists.txt +++ b/src/MEDOP/cmp/CMakeLists.txt @@ -26,7 +26,7 @@ INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIRS} ${KERNEL_ROOT_DIR}/include/salome ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR}/idl ${PROJECT_SOURCE_DIR}/src/MEDCoupling ${PROJECT_SOURCE_DIR}/src/INTERP_KERNEL/Bases ${PROJECT_SOURCE_DIR}/src/INTERP_KERNEL diff --git a/src/MEDOP/gui/CMakeLists.txt b/src/MEDOP/gui/CMakeLists.txt index a5095aac3..6a773cb49 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_BINARY_DIR}/idl - ${CMAKE_BINARY_DIR} + ${CMAKE_PROJECT_DIR}/idl + ${CMAKE_PROJECT_DIR} ) SET(MEDOPGUITS_SOURCES diff --git a/src/MEDPartitioner/CMakeLists.txt b/src/MEDPartitioner/CMakeLists.txt index 4cc5bf5dc..2c5c62dac 100644 --- a/src/MEDPartitioner/CMakeLists.txt +++ b/src/MEDPartitioner/CMakeLists.txt @@ -129,7 +129,7 @@ IF(${SALOME_USE_MPI}) SET_TARGET_PROPERTIES(medpartitioner_para PROPERTIES COMPILE_FLAGS "${medpartitionercpp_DEFINITIONS}") TARGET_LINK_LIBRARIES(medpartitioner_para medpartitionercpp ${medpartitionercpp_LDFLAGS}) INSTALL(TARGETS medpartitioner_para DESTINATION ${SALOME_INSTALL_BINS}) -ENDIF(${SALOME_USE_MPI}) +ENDIF(${SALOME_USE_MPI}) ADD_LIBRARY(medpartitionercpp SHARED ${medpartitionercpp_SOURCES}) SET_TARGET_PROPERTIES(medpartitionercpp PROPERTIES COMPILE_FLAGS "${PLATFORM_DEFINITIONS} ${medpartitionercpp_DEFINITIONS}") diff --git a/src/ParaMEDMEMTest/CMakeLists.txt b/src/ParaMEDMEMTest/CMakeLists.txt index 8234d6fea..a54c6955b 100644 --- a/src/ParaMEDMEMTest/CMakeLists.txt +++ b/src/ParaMEDMEMTest/CMakeLists.txt @@ -120,5 +120,3 @@ SET(COMMON_HEADERS_HXX MPI2Connector.hxx ) INSTALL(FILES ${COMMON_HEADERS_HXX} DESTINATION ${SALOME_INSTALL_HEADERS}) - - \ No newline at end of file