From e887ad15fe39797f5c0189038938371c74a7abdf Mon Sep 17 00:00:00 2001 From: bruneton Date: Tue, 9 Jul 2013 10:05:56 +0000 Subject: [PATCH] CMake: replacing CMAKE_* variables by PROJECT_* variables --- CMakeLists.txt | 2 +- doc/docutils/CMakeLists.txt | 6 ++-- doc/salome/gui/CMakeLists.txt | 6 ++-- doc/salome/tui/CMakeLists.txt | 4 +-- idl/CMakeLists.txt | 2 +- src/Communication/CMakeLists.txt | 4 +-- src/Communication_SWIG/CMakeLists.txt | 4 +-- src/Container/CMakeLists.txt | 4 +-- src/DSC/DSC_Basic/CMakeLists.txt | 18 +++++------ src/DSC/DSC_Python/CMakeLists.txt | 30 ++++++++--------- src/DSC/DSC_User/Basic/CMakeLists.txt | 20 ++++++------ src/DSC/DSC_User/CMakeLists.txt | 18 +++++------ src/DSC/DSC_User/Datastream/CMakeLists.txt | 8 ++--- .../Datastream/Calcium/CMakeLists.txt | 32 +++++++++---------- .../DSC_User/Datastream/Palm/CMakeLists.txt | 22 ++++++------- src/DSC/ParallelDSC/CMakeLists.txt | 24 +++++++------- src/GenericObj/CMakeLists.txt | 4 +-- src/KernelHelpers/CMakeLists.txt | 4 +-- src/KernelHelpers/Test/CMakeLists.txt | 22 ++++++------- src/Launcher/CMakeLists.txt | 4 +-- src/LifeCycleCORBA/CMakeLists.txt | 4 +-- src/LifeCycleCORBA/Test/CMakeLists.txt | 4 +-- src/LifeCycleCORBA_SWIG/CMakeLists.txt | 4 +-- src/Logger/CMakeLists.txt | 4 +-- src/MPIContainer/CMakeLists.txt | 4 +-- src/ModuleCatalog/CMakeLists.txt | 4 +-- src/NOTIFICATION_SWIG/CMakeLists.txt | 2 +- src/NamingService/CMakeLists.txt | 4 +-- src/NamingService/Test/CMakeLists.txt | 4 +-- src/Notification/CMakeLists.txt | 2 +- src/ParallelContainer/CMakeLists.txt | 22 ++++++------- src/Registry/CMakeLists.txt | 4 +-- src/ResourcesManager/CMakeLists.txt | 4 +-- src/SALOMEDS/CMakeLists.txt | 4 +-- src/SALOMEDS/Test/CMakeLists.txt | 4 +-- src/SALOMEDSClient/CMakeLists.txt | 4 +-- src/SALOMEDSImpl/CMakeLists.txt | 4 +-- src/SALOMEDSImpl/Test/CMakeLists.txt | 2 +- src/SALOMETraceCollector/CMakeLists.txt | 4 +-- src/TOOLSDS/CMakeLists.txt | 4 +-- src/TestContainer/CMakeLists.txt | 4 +-- src/TestMPIContainer/CMakeLists.txt | 4 +-- src/UnitTests/CMakeLists.txt | 4 +-- src/Utils/CMakeLists.txt | 4 +-- 44 files changed, 173 insertions(+), 173 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0ecedd428..25cb4c0fc 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,7 +38,7 @@ SET(VERSION_DEV "0") # Our own set of macros: LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/salome_adm/cmake_files") -INCLUDE(${CMAKE_SOURCE_DIR}/salome_adm/cmake_files/SalomeMacros.cmake) +INCLUDE(${PROJECT_SOURCE_DIR}/salome_adm/cmake_files/SalomeMacros.cmake) # Platform setup # ============== diff --git a/doc/docutils/CMakeLists.txt b/doc/docutils/CMakeLists.txt index 11bae40af..6165dcd1d 100755 --- a/doc/docutils/CMakeLists.txt +++ b/doc/docutils/CMakeLists.txt @@ -74,9 +74,9 @@ ENDIF(WINDOWS) FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/env_s.${EXT} "${SCR}") -ADD_CUSTOM_TARGET(html_docs ${CALL_STR} ${CMAKE_CURRENT_BINARY_DIR}/env_s.${EXT} && ${SPHINX_EXECUTABLE} -c ${CMAKE_BINARY_DIR}/doc/docutils -b html ${ALLSPHINXOPTS} docutils +ADD_CUSTOM_TARGET(html_docs ${CALL_STR} ${CMAKE_CURRENT_BINARY_DIR}/env_s.${EXT} && ${SPHINX_EXECUTABLE} -c ${PROJECT_BINARY_DIR}/doc/docutils -b html ${ALLSPHINXOPTS} docutils ) -INSTALL(CODE "EXECUTE_PROCESS(COMMAND \"${CMAKE_COMMAND}\" --build ${CMAKE_BINARY_DIR} --target html_docs)") +INSTALL(CODE "EXECUTE_PROCESS(COMMAND \"${CMAKE_COMMAND}\" --build ${PROJECT_BINARY_DIR} --target html_docs)") INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/docutils DESTINATION share/doc/salome/tui/KERNEL) -INSTALL(FILES ${CMAKE_SOURCE_DIR}/doc/salome/tui/images/head.png DESTINATION share/doc/salome/tui/KERNEL) +INSTALL(FILES ${PROJECT_SOURCE_DIR}/doc/salome/tui/images/head.png DESTINATION share/doc/salome/tui/KERNEL) diff --git a/doc/salome/gui/CMakeLists.txt b/doc/salome/gui/CMakeLists.txt index 7836ea224..32ac4efd0 100755 --- a/doc/salome/gui/CMakeLists.txt +++ b/doc/salome/gui/CMakeLists.txt @@ -17,8 +17,8 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(top_builddir ${CMAKE_BINARY_DIR}) -SET(top_srcdir ${CMAKE_SOURCE_DIR}) +SET(top_builddir ${PROJECT_BINARY_DIR}) +SET(top_srcdir ${PROJECT_SOURCE_DIR}) SET(srcdir ${CMAKE_CURRENT_SOURCE_DIR}) SET(builddir ${CMAKE_CURRENT_BINARY_DIR}) SET(datadir ${CMAKE_INSTALL_PREFIX}/share) @@ -31,6 +31,6 @@ ADD_CUSTOM_TARGET(usr_docs ${DOXYGEN_EXECUTABLE}) ADD_DEPENDENCIES(usr_docs html_docs) -INSTALL(CODE "EXECUTE_PROCESS(COMMAND \"${CMAKE_COMMAND}\" --build ${CMAKE_BINARY_DIR} --target usr_docs)") +INSTALL(CODE "EXECUTE_PROCESS(COMMAND \"${CMAKE_COMMAND}\" --build ${PROJECT_BINARY_DIR} --target usr_docs)") INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/KERNEL DESTINATION share/doc/salome/gui) INSTALL(FILES images/head.png DESTINATION share/doc/salome/gui/KERNEL) diff --git a/doc/salome/tui/CMakeLists.txt b/doc/salome/tui/CMakeLists.txt index 1f8b571de..c5b69007e 100755 --- a/doc/salome/tui/CMakeLists.txt +++ b/doc/salome/tui/CMakeLists.txt @@ -17,8 +17,8 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SET(top_builddir ${CMAKE_BINARY_DIR}) -SET(top_srcdir ${CMAKE_SOURCE_DIR}) +SET(top_builddir ${PROJECT_BINARY_DIR}) +SET(top_srcdir ${PROJECT_SOURCE_DIR}) SET(srcdir ${CMAKE_CURRENT_SOURCE_DIR}) SET(builddir ${CMAKE_CURRENT_BINARY_DIR}) SET(datadir ${CMAKE_INSTALL_PREFIX}/share) diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt index db4a3474f..33cd999f0 100755 --- a/idl/CMakeLists.txt +++ b/idl/CMakeLists.txt @@ -17,7 +17,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -INCLUDE(${CMAKE_SOURCE_DIR}/salome_adm/cmake_files/UseOmniORB.cmake) +INCLUDE(${PROJECT_SOURCE_DIR}/salome_adm/cmake_files/UseOmniORB.cmake) INCLUDE_DIRECTORIES( ${OMNIORB_INCLUDE_DIR} diff --git a/src/Communication/CMakeLists.txt b/src/Communication/CMakeLists.txt index 212d782a2..fe20f48bd 100755 --- a/src/Communication/CMakeLists.txt +++ b/src/Communication/CMakeLists.txt @@ -21,11 +21,11 @@ INCLUDE_DIRECTORIES( ${OMNIORB_INCLUDE_DIR} ${MPI_CXX_INCLUDE_PATH} ${PYTHON_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/salome_adm + ${PROJECT_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace ${CMAKE_CURRENT_SOURCE_DIR}/../Utils - ${CMAKE_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR}/idl ) SET(COMMON_LIBS diff --git a/src/Communication_SWIG/CMakeLists.txt b/src/Communication_SWIG/CMakeLists.txt index eb35c76bd..a50d3ad64 100755 --- a/src/Communication_SWIG/CMakeLists.txt +++ b/src/Communication_SWIG/CMakeLists.txt @@ -25,13 +25,13 @@ SET_SOURCE_FILES_PROPERTIES(libSALOME_Comm.i PROPERTIES SWIG_DEFINITIONS "-shado INCLUDE_DIRECTORIES( ${PYTHON_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} - ${CMAKE_BINARY_DIR}/salome_adm + ${PROJECT_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../Communication ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace ${CMAKE_CURRENT_SOURCE_DIR}/../Utils - ${CMAKE_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR}/idl ) ADD_DEFINITIONS(${OMNIORB_DEFINITIONS}) diff --git a/src/Container/CMakeLists.txt b/src/Container/CMakeLists.txt index 60d2b253c..d046b1831 100755 --- a/src/Container/CMakeLists.txt +++ b/src/Container/CMakeLists.txt @@ -23,7 +23,7 @@ INCLUDE_DIRECTORIES( ${HDF5_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/salome_adm + ${PROJECT_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace ${CMAKE_CURRENT_SOURCE_DIR}/../NamingService @@ -34,7 +34,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../HDFPersist ${CMAKE_CURRENT_SOURCE_DIR}/../GenericObj ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMETraceCollector/Test - ${CMAKE_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR}/idl ) SET(SCRIPTS diff --git a/src/DSC/DSC_Basic/CMakeLists.txt b/src/DSC/DSC_Basic/CMakeLists.txt index deeba9a26..9620d9d33 100755 --- a/src/DSC/DSC_Basic/CMakeLists.txt +++ b/src/DSC/DSC_Basic/CMakeLists.txt @@ -20,15 +20,15 @@ INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} - ${CMAKE_BINARY_DIR}/salome_adm - ${CMAKE_SOURCE_DIR}/src/Container - ${CMAKE_SOURCE_DIR}/src/GenericObj - ${CMAKE_SOURCE_DIR}/src/Notification - ${CMAKE_SOURCE_DIR}/src/SALOMELocalTrace - ${CMAKE_SOURCE_DIR}/src/Basics - ${CMAKE_SOURCE_DIR}/src/NamingService - ${CMAKE_SOURCE_DIR}/src/Utils - ${CMAKE_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR}/salome_adm + ${PROJECT_SOURCE_DIR}/src/Container + ${PROJECT_SOURCE_DIR}/src/GenericObj + ${PROJECT_SOURCE_DIR}/src/Notification + ${PROJECT_SOURCE_DIR}/src/SALOMELocalTrace + ${PROJECT_SOURCE_DIR}/src/Basics + ${PROJECT_SOURCE_DIR}/src/NamingService + ${PROJECT_SOURCE_DIR}/src/Utils + ${PROJECT_BINARY_DIR}/idl ) SET(SalomeDSCContainer_SOURCES diff --git a/src/DSC/DSC_Python/CMakeLists.txt b/src/DSC/DSC_Python/CMakeLists.txt index 7030cb9c2..3479662ca 100755 --- a/src/DSC/DSC_Python/CMakeLists.txt +++ b/src/DSC/DSC_Python/CMakeLists.txt @@ -28,21 +28,21 @@ INCLUDE_DIRECTORIES( ${OMNIORB_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/salome_adm - ${CMAKE_SOURCE_DIR}/src/DSC/DSC_User - ${CMAKE_SOURCE_DIR}/src/DSC/DSC_User/Datastream - ${CMAKE_SOURCE_DIR}/src/DSC/DSC_User/Datastream/Palm - ${CMAKE_SOURCE_DIR}/src/DSC/DSC_User/Datastream/Calcium - ${CMAKE_BINARY_DIR}/src/DSC/DSC_User/Datastream/Calcium - ${CMAKE_SOURCE_DIR}/src/DSC/DSC_User/Basic - ${CMAKE_SOURCE_DIR}/src/DSC/DSC_Basic - ${CMAKE_SOURCE_DIR}/src/SALOMELocalTrace - ${CMAKE_SOURCE_DIR}/src/Basics - ${CMAKE_SOURCE_DIR}/src/Utils - ${CMAKE_SOURCE_DIR}/src/Container - ${CMAKE_SOURCE_DIR}/src/GenericObj - ${CMAKE_SOURCE_DIR}/src/Notification - ${CMAKE_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR}/salome_adm + ${PROJECT_SOURCE_DIR}/src/DSC/DSC_User + ${PROJECT_SOURCE_DIR}/src/DSC/DSC_User/Datastream + ${PROJECT_SOURCE_DIR}/src/DSC/DSC_User/Datastream/Palm + ${PROJECT_SOURCE_DIR}/src/DSC/DSC_User/Datastream/Calcium + ${PROJECT_BINARY_DIR}/src/DSC/DSC_User/Datastream/Calcium + ${PROJECT_SOURCE_DIR}/src/DSC/DSC_User/Basic + ${PROJECT_SOURCE_DIR}/src/DSC/DSC_Basic + ${PROJECT_SOURCE_DIR}/src/SALOMELocalTrace + ${PROJECT_SOURCE_DIR}/src/Basics + ${PROJECT_SOURCE_DIR}/src/Utils + ${PROJECT_SOURCE_DIR}/src/Container + ${PROJECT_SOURCE_DIR}/src/GenericObj + ${PROJECT_SOURCE_DIR}/src/Notification + ${PROJECT_BINARY_DIR}/idl ) SET(_calcium_LIBS diff --git a/src/DSC/DSC_User/Basic/CMakeLists.txt b/src/DSC/DSC_User/Basic/CMakeLists.txt index 8d5fa512d..16082e3b9 100755 --- a/src/DSC/DSC_User/Basic/CMakeLists.txt +++ b/src/DSC/DSC_User/Basic/CMakeLists.txt @@ -20,16 +20,16 @@ INCLUDE_DIRECTORIES( ${OMNIORB_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIR} - ${CMAKE_BINARY_DIR}/idl - ${CMAKE_BINARY_DIR}/salome_adm - ${CMAKE_SOURCE_DIR}/src/DSC/DSC_Basic - ${CMAKE_SOURCE_DIR}/src/DSC/DSC_User - ${CMAKE_SOURCE_DIR}/src/Container - ${CMAKE_SOURCE_DIR}/src/GenericObj - ${CMAKE_SOURCE_DIR}/src/Notification - ${CMAKE_SOURCE_DIR}/src/SALOMELocalTrace - ${CMAKE_SOURCE_DIR}/src/Basics - ${CMAKE_SOURCE_DIR}/src/Utils) + ${PROJECT_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR}/salome_adm + ${PROJECT_SOURCE_DIR}/src/DSC/DSC_Basic + ${PROJECT_SOURCE_DIR}/src/DSC/DSC_User + ${PROJECT_SOURCE_DIR}/src/Container + ${PROJECT_SOURCE_DIR}/src/GenericObj + ${PROJECT_SOURCE_DIR}/src/Notification + ${PROJECT_SOURCE_DIR}/src/SALOMELocalTrace + ${PROJECT_SOURCE_DIR}/src/Basics + ${PROJECT_SOURCE_DIR}/src/Utils) SET(SalomeDSCSupervBasic_SOURCES basic_port_factory.cxx diff --git a/src/DSC/DSC_User/CMakeLists.txt b/src/DSC/DSC_User/CMakeLists.txt index 61ac66f8a..460f4d2b0 100755 --- a/src/DSC/DSC_User/CMakeLists.txt +++ b/src/DSC/DSC_User/CMakeLists.txt @@ -23,15 +23,15 @@ ADD_SUBDIRECTORY(Datastream) INCLUDE_DIRECTORIES( ${Boost_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} - ${CMAKE_BINARY_DIR}/salome_adm - ${CMAKE_SOURCE_DIR}/src/Container - ${CMAKE_SOURCE_DIR}/src/GenericObj - ${CMAKE_SOURCE_DIR}/src/Notification - ${CMAKE_SOURCE_DIR}/src/DSC/DSC_Basic - ${CMAKE_SOURCE_DIR}/src/SALOMELocalTrace - ${CMAKE_SOURCE_DIR}/src/Basics - ${CMAKE_SOURCE_DIR}/src/Utils - ${CMAKE_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR}/salome_adm + ${PROJECT_SOURCE_DIR}/src/Container + ${PROJECT_SOURCE_DIR}/src/GenericObj + ${PROJECT_SOURCE_DIR}/src/Notification + ${PROJECT_SOURCE_DIR}/src/DSC/DSC_Basic + ${PROJECT_SOURCE_DIR}/src/SALOMELocalTrace + ${PROJECT_SOURCE_DIR}/src/Basics + ${PROJECT_SOURCE_DIR}/src/Utils + ${PROJECT_BINARY_DIR}/idl ) ADD_DEFINITIONS(${OMNIORB_DEFINITIONS} ${BOOST_DEFINITIONS}) diff --git a/src/DSC/DSC_User/Datastream/CMakeLists.txt b/src/DSC/DSC_User/Datastream/CMakeLists.txt index b746c05de..030111b36 100755 --- a/src/DSC/DSC_User/Datastream/CMakeLists.txt +++ b/src/DSC/DSC_User/Datastream/CMakeLists.txt @@ -22,10 +22,10 @@ ADD_SUBDIRECTORY(Calcium) INCLUDE_DIRECTORIES( ${Boost_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/salome_adm - ${CMAKE_SOURCE_DIR}/src/DSC/DSC_User - ${CMAKE_BINARY_DIR}/src/DSC/DSC_User/Datastream/Palm - ${CMAKE_BINARY_DIR}/src/DSC/DSC_User/Datastream/Calcium + ${PROJECT_BINARY_DIR}/salome_adm + ${PROJECT_SOURCE_DIR}/src/DSC/DSC_User + ${PROJECT_BINARY_DIR}/src/DSC/DSC_User/Datastream/Palm + ${PROJECT_BINARY_DIR}/src/DSC/DSC_User/Datastream/Calcium ${CMAKE_CURRENT_SOURCE_DIR}/.. ) diff --git a/src/DSC/DSC_User/Datastream/Calcium/CMakeLists.txt b/src/DSC/DSC_User/Datastream/Calcium/CMakeLists.txt index e96127b6f..3fc1c2b10 100755 --- a/src/DSC/DSC_User/Datastream/Calcium/CMakeLists.txt +++ b/src/DSC/DSC_User/Datastream/Calcium/CMakeLists.txt @@ -20,22 +20,22 @@ INCLUDE_DIRECTORIES( ${Boost_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIR} - ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/salome_adm - ${CMAKE_SOURCE_DIR}/src/DSC/DSC_User - ${CMAKE_SOURCE_DIR}/src/DSC/DSC_User/Datastream - ${CMAKE_SOURCE_DIR}/src/DSC/DSC_User/Datastream/Palm - ${CMAKE_SOURCE_DIR}/src/DSC/DSC_User/Datastream/Calcium - ${CMAKE_SOURCE_DIR}/src/DSC/DSC_User/Basic - ${CMAKE_SOURCE_DIR}/src/DSC/DSC_Basic - ${CMAKE_SOURCE_DIR}/src/SALOMELocalTrace - ${CMAKE_SOURCE_DIR}/src/Basics - ${CMAKE_SOURCE_DIR}/src/Utils - ${CMAKE_SOURCE_DIR}/src/Container - ${CMAKE_SOURCE_DIR}/src/GenericObj - ${CMAKE_SOURCE_DIR}/src/Notification - ${CMAKE_BINARY_DIR}/idl - ${CMAKE_BINARY_DIR}/src/DSC/DSC_User/Datastream/Calcium + ${PROJECT_BINARY_DIR} + ${PROJECT_BINARY_DIR}/salome_adm + ${PROJECT_SOURCE_DIR}/src/DSC/DSC_User + ${PROJECT_SOURCE_DIR}/src/DSC/DSC_User/Datastream + ${PROJECT_SOURCE_DIR}/src/DSC/DSC_User/Datastream/Palm + ${PROJECT_SOURCE_DIR}/src/DSC/DSC_User/Datastream/Calcium + ${PROJECT_SOURCE_DIR}/src/DSC/DSC_User/Basic + ${PROJECT_SOURCE_DIR}/src/DSC/DSC_Basic + ${PROJECT_SOURCE_DIR}/src/SALOMELocalTrace + ${PROJECT_SOURCE_DIR}/src/Basics + ${PROJECT_SOURCE_DIR}/src/Utils + ${PROJECT_SOURCE_DIR}/src/Container + ${PROJECT_SOURCE_DIR}/src/GenericObj + ${PROJECT_SOURCE_DIR}/src/Notification + ${PROJECT_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR}/src/DSC/DSC_User/Datastream/Calcium ) SET(SalomeCalcium_SOURCES diff --git a/src/DSC/DSC_User/Datastream/Palm/CMakeLists.txt b/src/DSC/DSC_User/Datastream/Palm/CMakeLists.txt index 5d27ed9bc..67c89f4ab 100755 --- a/src/DSC/DSC_User/Datastream/Palm/CMakeLists.txt +++ b/src/DSC/DSC_User/Datastream/Palm/CMakeLists.txt @@ -19,17 +19,17 @@ INCLUDE_DIRECTORIES( ${OMNIORB_INCLUDE_DIR} - ${CMAKE_BINARY_DIR}/salome_adm - ${CMAKE_SOURCE_DIR}/src/DSC/DSC_User - ${CMAKE_SOURCE_DIR}/src/DSC/DSC_User/Datastream - ${CMAKE_SOURCE_DIR}/src/DSC/DSC_Basic - ${CMAKE_SOURCE_DIR}/src/Container - ${CMAKE_SOURCE_DIR}/src/GenericObj - ${CMAKE_SOURCE_DIR}/src/Notification - ${CMAKE_SOURCE_DIR}/src/SALOMELocalTrace - ${CMAKE_SOURCE_DIR}/src/Basics - ${CMAKE_SOURCE_DIR}/src/Utils - ${CMAKE_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR}/salome_adm + ${PROJECT_SOURCE_DIR}/src/DSC/DSC_User + ${PROJECT_SOURCE_DIR}/src/DSC/DSC_User/Datastream + ${PROJECT_SOURCE_DIR}/src/DSC/DSC_Basic + ${PROJECT_SOURCE_DIR}/src/Container + ${PROJECT_SOURCE_DIR}/src/GenericObj + ${PROJECT_SOURCE_DIR}/src/Notification + ${PROJECT_SOURCE_DIR}/src/SALOMELocalTrace + ${PROJECT_SOURCE_DIR}/src/Basics + ${PROJECT_SOURCE_DIR}/src/Utils + ${PROJECT_BINARY_DIR}/idl ) diff --git a/src/DSC/ParallelDSC/CMakeLists.txt b/src/DSC/ParallelDSC/CMakeLists.txt index e06433d19..127bfb29d 100755 --- a/src/DSC/ParallelDSC/CMakeLists.txt +++ b/src/DSC/ParallelDSC/CMakeLists.txt @@ -21,18 +21,18 @@ INCLUDE_DIRECTORIES( ${MPI_CXX_INCLUDE_PATH} ${PACO_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} - ${CMAKE_SOURCE_DIR}/src/Container - ${CMAKE_SOURCE_DIR}/src/ParallelContainer - ${CMAKE_SOURCE_DIR}/src/Notification - ${CMAKE_SOURCE_DIR}/src/SALOMELocalTrace - ${CMAKE_SOURCE_DIR}/src/Basics - ${CMAKE_SOURCE_DIR}/src/NamingService - ${CMAKE_SOURCE_DIR}/src/Utils - ${CMAKE_SOURCE_DIR}/src/DSC/DSC_Basic - ${CMAKE_SOURCE_DIR}/src/GenericObj - ${CMAKE_BINARY_DIR}/idl - ${CMAKE_SOURCE_DIR}/src/Registry - ${CMAKE_SOURCE_DIR}/src/Utils + ${PROJECT_SOURCE_DIR}/src/Container + ${PROJECT_SOURCE_DIR}/src/ParallelContainer + ${PROJECT_SOURCE_DIR}/src/Notification + ${PROJECT_SOURCE_DIR}/src/SALOMELocalTrace + ${PROJECT_SOURCE_DIR}/src/Basics + ${PROJECT_SOURCE_DIR}/src/NamingService + ${PROJECT_SOURCE_DIR}/src/Utils + ${PROJECT_SOURCE_DIR}/src/DSC/DSC_Basic + ${PROJECT_SOURCE_DIR}/src/GenericObj + ${PROJECT_BINARY_DIR}/idl + ${PROJECT_SOURCE_DIR}/src/Registry + ${PROJECT_SOURCE_DIR}/src/Utils ) SET(COMMON_FLAGS diff --git a/src/GenericObj/CMakeLists.txt b/src/GenericObj/CMakeLists.txt index 9a52b25e1..f24af77cb 100755 --- a/src/GenericObj/CMakeLists.txt +++ b/src/GenericObj/CMakeLists.txt @@ -20,10 +20,10 @@ INCLUDE_DIRECTORIES( ${OMNIORB_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/salome_adm + ${PROJECT_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace - ${CMAKE_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR}/idl ) ADD_DEFINITIONS(${OMNIORB_DEFINITIONS}) diff --git a/src/KernelHelpers/CMakeLists.txt b/src/KernelHelpers/CMakeLists.txt index 8a9e40ad3..d7125dda5 100755 --- a/src/KernelHelpers/CMakeLists.txt +++ b/src/KernelHelpers/CMakeLists.txt @@ -20,7 +20,7 @@ INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} - ${CMAKE_BINARY_DIR}/salome_adm + ${PROJECT_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../NamingService ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace ${CMAKE_CURRENT_SOURCE_DIR}/../Basics @@ -29,7 +29,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../Container ${CMAKE_CURRENT_SOURCE_DIR}/../Notification ${CMAKE_CURRENT_SOURCE_DIR}/../GenericObj - ${CMAKE_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR}/idl ) SET(SalomeKernelHelpers_LIBS diff --git a/src/KernelHelpers/Test/CMakeLists.txt b/src/KernelHelpers/Test/CMakeLists.txt index bf348765a..5f769cc75 100755 --- a/src/KernelHelpers/Test/CMakeLists.txt +++ b/src/KernelHelpers/Test/CMakeLists.txt @@ -20,18 +20,18 @@ INCLUDE_DIRECTORIES( ${CPPUNIT_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} - ${CMAKE_BINARY_DIR}/salome_adm - ${CMAKE_SOURCE_DIR}/src/Basics/Test + ${PROJECT_BINARY_DIR}/salome_adm + ${PROJECT_SOURCE_DIR}/src/Basics/Test ${CMAKE_CURRENT_SOURCE_DIR}/.. - ${CMAKE_SOURCE_DIR}/src/NamingService - ${CMAKE_SOURCE_DIR}/src/SALOMELocalTrace - ${CMAKE_SOURCE_DIR}/src/Basics - ${CMAKE_SOURCE_DIR}/src/Utils - ${CMAKE_SOURCE_DIR}/src/LifeCycleCORBA - ${CMAKE_SOURCE_DIR}/src/Container - ${CMAKE_SOURCE_DIR}/src/Notification - ${CMAKE_SOURCE_DIR}/src/GenericObj - ${CMAKE_BINARY_DIR}/idl + ${PROJECT_SOURCE_DIR}/src/NamingService + ${PROJECT_SOURCE_DIR}/src/SALOMELocalTrace + ${PROJECT_SOURCE_DIR}/src/Basics + ${PROJECT_SOURCE_DIR}/src/Utils + ${PROJECT_SOURCE_DIR}/src/LifeCycleCORBA + ${PROJECT_SOURCE_DIR}/src/Container + ${PROJECT_SOURCE_DIR}/src/Notification + ${PROJECT_SOURCE_DIR}/src/GenericObj + ${PROJECT_BINARY_DIR}/idl ) SET(SalomeKernelHelpersTest_LIBS diff --git a/src/Launcher/CMakeLists.txt b/src/Launcher/CMakeLists.txt index 71437ba54..3e304ceea 100755 --- a/src/Launcher/CMakeLists.txt +++ b/src/Launcher/CMakeLists.txt @@ -24,7 +24,7 @@ INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIRS} ${MPI_CXX_INCLUDE_PATH} ${LIBBATCH_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/salome_adm + ${PROJECT_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace ${CMAKE_CURRENT_SOURCE_DIR}/../NamingService @@ -33,7 +33,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../Notification ${CMAKE_CURRENT_SOURCE_DIR}/../Container ${CMAKE_CURRENT_SOURCE_DIR}/../ResourcesManager - ${CMAKE_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR}/idl ) ADD_DEFINITIONS(${MPI_CXX_COMPILE_FLAGS} ${LIBXML2_DEFINITIONS} ${OMNIORB_DEFINITIONS}) diff --git a/src/LifeCycleCORBA/CMakeLists.txt b/src/LifeCycleCORBA/CMakeLists.txt index 3870da38f..34e13346c 100755 --- a/src/LifeCycleCORBA/CMakeLists.txt +++ b/src/LifeCycleCORBA/CMakeLists.txt @@ -22,7 +22,7 @@ INCLUDE_DIRECTORIES( ${OMNIORB_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/salome_adm + ${PROJECT_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMETraceCollector @@ -34,7 +34,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../Batch ${CMAKE_CURRENT_SOURCE_DIR}/../Notification ${CMAKE_CURRENT_SOURCE_DIR}/../Registry - ${CMAKE_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR}/idl ) SET(COMMON_LIBS diff --git a/src/LifeCycleCORBA/Test/CMakeLists.txt b/src/LifeCycleCORBA/Test/CMakeLists.txt index 032d133de..da514757a 100755 --- a/src/LifeCycleCORBA/Test/CMakeLists.txt +++ b/src/LifeCycleCORBA/Test/CMakeLists.txt @@ -21,7 +21,7 @@ INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIRS} ${CPPUNIT_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} - ${CMAKE_BINARY_DIR}/salome_adm + ${PROJECT_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../../Basics/Test ${CMAKE_CURRENT_SOURCE_DIR}/../../SALOMELocalTrace @@ -34,7 +34,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../../Utils/Test ${CMAKE_CURRENT_SOURCE_DIR}/../../ResourcesManager ${CMAKE_CURRENT_SOURCE_DIR}/../../LifeCycleCORBA - ${CMAKE_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR}/idl ) SET(COMMON_LIBS diff --git a/src/LifeCycleCORBA_SWIG/CMakeLists.txt b/src/LifeCycleCORBA_SWIG/CMakeLists.txt index b66c7396f..40bf7d6a4 100755 --- a/src/LifeCycleCORBA_SWIG/CMakeLists.txt +++ b/src/LifeCycleCORBA_SWIG/CMakeLists.txt @@ -27,7 +27,7 @@ INCLUDE_DIRECTORIES( ${PYTHON_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} - ${CMAKE_BINARY_DIR}/salome_adm + ${PROJECT_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../NamingService @@ -35,7 +35,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace ${CMAKE_CURRENT_SOURCE_DIR}/../Utils - ${CMAKE_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR}/idl ) SWIG_ADD_MODULE(libSALOME_LifeCycleCORBA python libSALOME_LifeCycleCORBA.i) diff --git a/src/Logger/CMakeLists.txt b/src/Logger/CMakeLists.txt index b1b60f001..c07c0e66c 100755 --- a/src/Logger/CMakeLists.txt +++ b/src/Logger/CMakeLists.txt @@ -19,10 +19,10 @@ INCLUDE_DIRECTORIES( ${OMNIORB_INCLUDE_DIR} - ${CMAKE_BINARY_DIR}/salome_adm + ${PROJECT_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace - ${CMAKE_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR}/idl ) ADD_DEFINITIONS(${OMNIORB_DEFINITIONS}) diff --git a/src/MPIContainer/CMakeLists.txt b/src/MPIContainer/CMakeLists.txt index f69715cc9..7f4e7cb25 100755 --- a/src/MPIContainer/CMakeLists.txt +++ b/src/MPIContainer/CMakeLists.txt @@ -22,7 +22,7 @@ INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} - ${CMAKE_BINARY_DIR}/salome_adm + ${PROJECT_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace ${CMAKE_CURRENT_SOURCE_DIR}/../NamingService @@ -32,7 +32,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../ResourcesManager ${CMAKE_CURRENT_SOURCE_DIR}/../Container ${CMAKE_CURRENT_SOURCE_DIR}/../GenericObj - ${CMAKE_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR}/idl ) SET(COMMON_LIBS diff --git a/src/ModuleCatalog/CMakeLists.txt b/src/ModuleCatalog/CMakeLists.txt index 70f088016..9f7f0acbf 100755 --- a/src/ModuleCatalog/CMakeLists.txt +++ b/src/ModuleCatalog/CMakeLists.txt @@ -21,12 +21,12 @@ INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR} - ${CMAKE_BINARY_DIR}/salome_adm + ${PROJECT_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace ${CMAKE_CURRENT_SOURCE_DIR}/../NamingService ${CMAKE_CURRENT_SOURCE_DIR}/../Utils - ${CMAKE_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR}/idl ) # This local variable defines the list of dependant libraries common to all target in this package. diff --git a/src/NOTIFICATION_SWIG/CMakeLists.txt b/src/NOTIFICATION_SWIG/CMakeLists.txt index d3dd28d9b..079bbbb02 100755 --- a/src/NOTIFICATION_SWIG/CMakeLists.txt +++ b/src/NOTIFICATION_SWIG/CMakeLists.txt @@ -28,7 +28,7 @@ INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_BINARY_DIR}/salome_adm + ${PROJECT_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../Notification ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace diff --git a/src/NamingService/CMakeLists.txt b/src/NamingService/CMakeLists.txt index bb692657d..f7d2c47e5 100755 --- a/src/NamingService/CMakeLists.txt +++ b/src/NamingService/CMakeLists.txt @@ -20,11 +20,11 @@ INCLUDE_DIRECTORIES( ${OMNIORB_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/salome_adm + ${PROJECT_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace ${CMAKE_CURRENT_SOURCE_DIR}/../Utils - ${CMAKE_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR}/idl ) SET(SalomeNS_SOURCES diff --git a/src/NamingService/Test/CMakeLists.txt b/src/NamingService/Test/CMakeLists.txt index 63a009fcb..a41a34104 100755 --- a/src/NamingService/Test/CMakeLists.txt +++ b/src/NamingService/Test/CMakeLists.txt @@ -21,13 +21,13 @@ INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIRS} ${CPPUNIT_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} - ${CMAKE_BINARY_DIR}/salome_adm + ${PROJECT_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../../NamingService ${CMAKE_CURRENT_SOURCE_DIR}/../../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../../SALOMELocalTrace ${CMAKE_CURRENT_SOURCE_DIR}/../../Utils ${CMAKE_CURRENT_SOURCE_DIR}/../../LifeCycleCORBA - ${CMAKE_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR}/idl ${CMAKE_CURRENT_SOURCE_DIR}/../../SALOMELocalTrace/Test ${CMAKE_CURRENT_SOURCE_DIR}/../../SALOMETraceCollector/Test ${CMAKE_CURRENT_SOURCE_DIR}/../../Utils/Test diff --git a/src/Notification/CMakeLists.txt b/src/Notification/CMakeLists.txt index c0b2a711c..b0c0ce6d9 100755 --- a/src/Notification/CMakeLists.txt +++ b/src/Notification/CMakeLists.txt @@ -20,7 +20,7 @@ INCLUDE_DIRECTORIES( ${OMNIORB_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/salome_adm + ${PROJECT_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace ${CMAKE_CURRENT_SOURCE_DIR}/../Utils diff --git a/src/ParallelContainer/CMakeLists.txt b/src/ParallelContainer/CMakeLists.txt index 10b3d47d6..a3d8e77e3 100755 --- a/src/ParallelContainer/CMakeLists.txt +++ b/src/ParallelContainer/CMakeLists.txt @@ -22,18 +22,18 @@ INCLUDE_DIRECTORIES( ${MPI_CXX_INCLUDE_PATH} ${PYTHON_INCLUDE_DIRS} ${PACO_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/salome_adm - ${CMAKE_SOURCE_DIR}/src/Container - ${CMAKE_SOURCE_DIR}/src/Notification - ${CMAKE_SOURCE_DIR}/src/SALOMELocalTrace - ${CMAKE_SOURCE_DIR}/src/Basics - ${CMAKE_SOURCE_DIR}/src/NamingService - ${CMAKE_SOURCE_DIR}/src/Registry - ${CMAKE_SOURCE_DIR}/src/Utils - ${CMAKE_SOURCE_DIR}/src/GenericObj + ${PROJECT_BINARY_DIR}/salome_adm + ${PROJECT_SOURCE_DIR}/src/Container + ${PROJECT_SOURCE_DIR}/src/Notification + ${PROJECT_SOURCE_DIR}/src/SALOMELocalTrace + ${PROJECT_SOURCE_DIR}/src/Basics + ${PROJECT_SOURCE_DIR}/src/NamingService + ${PROJECT_SOURCE_DIR}/src/Registry + ${PROJECT_SOURCE_DIR}/src/Utils + ${PROJECT_SOURCE_DIR}/src/GenericObj ${CMAKE_CURRENT_SOURCE_DIR}/../HDFPersist - ${CMAKE_BINARY_DIR}/idl - ${CMAKE_SOURCE_DIR}/src/SALOMETraceCollector + ${PROJECT_BINARY_DIR}/idl + ${PROJECT_SOURCE_DIR}/src/SALOMETraceCollector ${PACOPATH}/lib ) diff --git a/src/Registry/CMakeLists.txt b/src/Registry/CMakeLists.txt index 1cc93f01e..f0261afe2 100755 --- a/src/Registry/CMakeLists.txt +++ b/src/Registry/CMakeLists.txt @@ -20,12 +20,12 @@ INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} - ${CMAKE_BINARY_DIR}/salome_adm + ${PROJECT_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace ${CMAKE_CURRENT_SOURCE_DIR}/../NamingService ${CMAKE_CURRENT_SOURCE_DIR}/../Utils - ${CMAKE_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR}/idl ) ADD_LIBRARY(Registry RegistryConnexion.cxx RegistryService.cxx) diff --git a/src/ResourcesManager/CMakeLists.txt b/src/ResourcesManager/CMakeLists.txt index 72a25650b..40ced58f4 100755 --- a/src/ResourcesManager/CMakeLists.txt +++ b/src/ResourcesManager/CMakeLists.txt @@ -21,12 +21,12 @@ INCLUDE_DIRECTORIES( ${LIBXML2_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} - ${CMAKE_BINARY_DIR}/salome_adm + ${PROJECT_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace ${CMAKE_CURRENT_SOURCE_DIR}/../NamingService ${CMAKE_CURRENT_SOURCE_DIR}/../Utils - ${CMAKE_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR}/idl ) diff --git a/src/SALOMEDS/CMakeLists.txt b/src/SALOMEDS/CMakeLists.txt index 0fe8dec8d..7f78692b0 100755 --- a/src/SALOMEDS/CMakeLists.txt +++ b/src/SALOMEDS/CMakeLists.txt @@ -22,7 +22,7 @@ INCLUDE_DIRECTORIES( ${OMNIORB_INCLUDE_DIR} ${HDF5_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/salome_adm + ${PROJECT_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../HDFPersist ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace @@ -33,7 +33,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../GenericObj ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMEDSClient ${CMAKE_CURRENT_SOURCE_DIR}/../LifeCycleCORBA - ${CMAKE_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR}/idl ) ADD_DEFINITIONS(${OMNIORB_DEFINITIONS} ${HDF5_DEFINITIONS} ${BOOST_DEFINITIONS}) diff --git a/src/SALOMEDS/Test/CMakeLists.txt b/src/SALOMEDS/Test/CMakeLists.txt index 79b0ae8c1..71df2dee8 100755 --- a/src/SALOMEDS/Test/CMakeLists.txt +++ b/src/SALOMEDS/Test/CMakeLists.txt @@ -21,7 +21,7 @@ INCLUDE_DIRECTORIES( ${CPPUNIT_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/salome_adm + ${PROJECT_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../../Basics/Test ${CMAKE_CURRENT_SOURCE_DIR}/../../SALOMELocalTrace @@ -39,7 +39,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../../DF ${CMAKE_CURRENT_SOURCE_DIR}/../../SALOMEDSImpl ${CMAKE_CURRENT_SOURCE_DIR}/../../SALOMEDSImpl/Test - ${CMAKE_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR}/idl ) # This local variable defines the list of dependant libraries common to all target in this package. diff --git a/src/SALOMEDSClient/CMakeLists.txt b/src/SALOMEDSClient/CMakeLists.txt index ed187ffca..a94632f16 100755 --- a/src/SALOMEDSClient/CMakeLists.txt +++ b/src/SALOMEDSClient/CMakeLists.txt @@ -20,8 +20,8 @@ INCLUDE_DIRECTORIES( ${OMNIORB_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/salome_adm - ${CMAKE_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR}/salome_adm + ${PROJECT_BINARY_DIR}/idl ) ADD_DEFINITIONS(${OMNIORB_DEFINITIONS}) diff --git a/src/SALOMEDSImpl/CMakeLists.txt b/src/SALOMEDSImpl/CMakeLists.txt index 75b6448cd..15a115d3e 100755 --- a/src/SALOMEDSImpl/CMakeLists.txt +++ b/src/SALOMEDSImpl/CMakeLists.txt @@ -21,12 +21,12 @@ INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIRS} ${HDF5_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/salome_adm + ${PROJECT_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace ${CMAKE_CURRENT_SOURCE_DIR}/../HDFPersist ${CMAKE_CURRENT_SOURCE_DIR}/../DF - ${CMAKE_BINARY_DIR} + ${PROJECT_BINARY_DIR} ) # This local variable defines the list of FLAGS common to all target in this package. diff --git a/src/SALOMEDSImpl/Test/CMakeLists.txt b/src/SALOMEDSImpl/Test/CMakeLists.txt index 2d4c1e7ba..37c331af6 100755 --- a/src/SALOMEDSImpl/Test/CMakeLists.txt +++ b/src/SALOMEDSImpl/Test/CMakeLists.txt @@ -35,7 +35,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../../LifeCycleCORBA ${CMAKE_CURRENT_SOURCE_DIR}/../../DF ${CMAKE_CURRENT_SOURCE_DIR}/../../SALOMEDSImpl - ${CMAKE_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR}/idl ) # This local variable defines the list of dependant libraries common to all target in this package. diff --git a/src/SALOMETraceCollector/CMakeLists.txt b/src/SALOMETraceCollector/CMakeLists.txt index cb81ac4f1..85da79426 100755 --- a/src/SALOMETraceCollector/CMakeLists.txt +++ b/src/SALOMETraceCollector/CMakeLists.txt @@ -20,10 +20,10 @@ INCLUDE_DIRECTORIES( ${OMNIORB_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/salome_adm + ${PROJECT_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace - ${CMAKE_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR}/idl ) ADD_DEFINITIONS(${OMNIORB_DEFINITIONS} ${PTHREAD_DEFINITIONS}) diff --git a/src/TOOLSDS/CMakeLists.txt b/src/TOOLSDS/CMakeLists.txt index 15ace71c5..6109bc945 100755 --- a/src/TOOLSDS/CMakeLists.txt +++ b/src/TOOLSDS/CMakeLists.txt @@ -22,11 +22,11 @@ INCLUDE_DIRECTORIES( ${HDF5_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/salome_adm + ${PROJECT_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../Utils - ${CMAKE_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR}/idl ) ADD_LIBRARY(TOOLSDS SALOMEDS_Tool.cxx) diff --git a/src/TestContainer/CMakeLists.txt b/src/TestContainer/CMakeLists.txt index b4f4cb84b..0ef35ef57 100755 --- a/src/TestContainer/CMakeLists.txt +++ b/src/TestContainer/CMakeLists.txt @@ -20,7 +20,7 @@ INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} - ${CMAKE_BINARY_DIR}/salome_adm + ${PROJECT_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace ${CMAKE_CURRENT_SOURCE_DIR}/../NamingService @@ -30,7 +30,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../ResourcesManager ${CMAKE_CURRENT_SOURCE_DIR}/../Container ${CMAKE_CURRENT_SOURCE_DIR}/../GenericObj - ${CMAKE_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR}/idl ) SET(SalomeTestComponentEngine_SOURCES diff --git a/src/TestMPIContainer/CMakeLists.txt b/src/TestMPIContainer/CMakeLists.txt index 736511664..c1df62ac5 100755 --- a/src/TestMPIContainer/CMakeLists.txt +++ b/src/TestMPIContainer/CMakeLists.txt @@ -20,7 +20,7 @@ INCLUDE_DIRECTORIES( ${MPI_CXX_INCLUDE_PATH} ${OMNIORB_INCLUDE_DIR} - ${CMAKE_BINARY_DIR}/salome_adm + ${PROJECT_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace ${CMAKE_CURRENT_SOURCE_DIR}/../NamingService @@ -31,7 +31,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../Container ${CMAKE_CURRENT_SOURCE_DIR}/../MPIContainer ${CMAKE_CURRENT_SOURCE_DIR}/../GenericObj - ${CMAKE_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR}/idl ) ADD_DEFINITIONS(${OMNIORB_DEFINITIONS} ${MPI_CXX_COMPILE_FLAGS}) diff --git a/src/UnitTests/CMakeLists.txt b/src/UnitTests/CMakeLists.txt index f01aae568..7c0d74b34 100755 --- a/src/UnitTests/CMakeLists.txt +++ b/src/UnitTests/CMakeLists.txt @@ -19,7 +19,7 @@ INCLUDE_DIRECTORIES( ${CPPUNIT_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/salome_adm + ${PROJECT_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../Basics/Test ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace @@ -60,7 +60,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMEDSImpl/Test ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMDES ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMEDS/Test - ${CMAKE_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR}/idl ${CMAKE_CURRENT_SOURCE_DIR}/../Registry ${CMAKE_CURRENT_SOURCE_DIR}/../Notification ${CMAKE_CURRENT_SOURCE_DIR}/../ResourcesManager diff --git a/src/Utils/CMakeLists.txt b/src/Utils/CMakeLists.txt index 2bebc3a99..769f2ce87 100755 --- a/src/Utils/CMakeLists.txt +++ b/src/Utils/CMakeLists.txt @@ -20,11 +20,11 @@ INCLUDE_DIRECTORIES( ${OMNIORB_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/salome_adm + ${PROJECT_BINARY_DIR}/salome_adm ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../Basics ${CMAKE_CURRENT_SOURCE_DIR}/../SALOMELocalTrace - ${CMAKE_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR}/idl ) SET(OpUtil_SOURCES Utils_Timer.cxx -- 2.39.2