From 8b9900140f7696371500751caf743f1b51c896bd Mon Sep 17 00:00:00 2001 From: bruneton Date: Tue, 9 Jul 2013 10:07:47 +0000 Subject: [PATCH] CMake: replacing CMAKE_* variables by PROJECT_* variables. --- doc/salome/gui/CMakeLists.txt | 6 +++--- doc/salome/tui/CMakeLists.txt | 4 ++-- src/CAM/CMakeLists.txt | 2 +- src/LightApp/CMakeLists.txt | 2 +- src/ResExporter/CMakeLists.txt | 2 +- src/SALOME_PYQT/SalomePyQt/CMakeLists.txt | 2 +- src/SALOME_SWIG/CMakeLists.txt | 4 ++-- src/SUITApp/CMakeLists.txt | 2 +- src/SVTK/CMakeLists.txt | 2 +- src/SalomeApp/CMakeLists.txt | 2 +- src/Session/CMakeLists.txt | 4 ++-- src/TOOLSGUI/CMakeLists.txt | 2 +- src/TreeData/Test/CMakeLists.txt | 4 ++-- 13 files changed, 19 insertions(+), 19 deletions(-) diff --git a/doc/salome/gui/CMakeLists.txt b/doc/salome/gui/CMakeLists.txt index 1abb0f4c3..b5b526376 100755 --- a/doc/salome/gui/CMakeLists.txt +++ b/doc/salome/gui/CMakeLists.txt @@ -20,8 +20,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) @@ -34,6 +34,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}/GUI DESTINATION share/doc/salome/gui) INSTALL(FILES images/head.png DESTINATION share/doc/salome/gui/GUI) diff --git a/doc/salome/tui/CMakeLists.txt b/doc/salome/tui/CMakeLists.txt index a1a2161a6..56bf22571 100755 --- a/doc/salome/tui/CMakeLists.txt +++ b/doc/salome/tui/CMakeLists.txt @@ -21,10 +21,10 @@ # SET(top_builddir - ${CMAKE_BINARY_DIR} + ${PROJECT_BINARY_DIR} ) SET(top_srcdir - ${CMAKE_SOURCE_DIR} + ${PROJECT_SOURCE_DIR} ) SET(srcdir ${CMAKE_CURRENT_SOURCE_DIR} diff --git a/src/CAM/CMakeLists.txt b/src/CAM/CMakeLists.txt index f03e66d73..e4ee23899 100755 --- a/src/CAM/CMakeLists.txt +++ b/src/CAM/CMakeLists.txt @@ -23,7 +23,7 @@ INCLUDE_DIRECTORIES( ${QT_INCLUDES} ${KERNEL_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_BINARY_DIR} + ${PROJECT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../Qtx ${CMAKE_CURRENT_SOURCE_DIR}/../SUIT ${CMAKE_CURRENT_SOURCE_DIR}/../STD diff --git a/src/LightApp/CMakeLists.txt b/src/LightApp/CMakeLists.txt index a0a25ab3b..7585deb45 100755 --- a/src/LightApp/CMakeLists.txt +++ b/src/LightApp/CMakeLists.txt @@ -26,7 +26,7 @@ INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIRS} ${QWT_INCLUDE_DIR} ${KERNEL_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR} + ${PROJECT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../SUIT ${CMAKE_CURRENT_SOURCE_DIR}/../STD ${CMAKE_CURRENT_SOURCE_DIR}/../CAM diff --git a/src/ResExporter/CMakeLists.txt b/src/ResExporter/CMakeLists.txt index b840065ae..a44d04ecc 100755 --- a/src/ResExporter/CMakeLists.txt +++ b/src/ResExporter/CMakeLists.txt @@ -20,7 +20,7 @@ INCLUDE_DIRECTORIES( ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_BINARY_DIR} + ${PROJECT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../Qtx ${CMAKE_CURRENT_SOURCE_DIR}/../SUIT ) diff --git a/src/SALOME_PYQT/SalomePyQt/CMakeLists.txt b/src/SALOME_PYQT/SalomePyQt/CMakeLists.txt index 9f7d67b46..3c5560d07 100755 --- a/src/SALOME_PYQT/SalomePyQt/CMakeLists.txt +++ b/src/SALOME_PYQT/SalomePyQt/CMakeLists.txt @@ -30,7 +30,7 @@ INCLUDE_DIRECTORIES( ${KERNEL_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR}/idl ${CMAKE_CURRENT_SOURCE_DIR}/../../SUIT ${CMAKE_CURRENT_SOURCE_DIR}/../../CAM ${CMAKE_CURRENT_SOURCE_DIR}/../../STD diff --git a/src/SALOME_SWIG/CMakeLists.txt b/src/SALOME_SWIG/CMakeLists.txt index dcb255075..5dfd50f19 100755 --- a/src/SALOME_SWIG/CMakeLists.txt +++ b/src/SALOME_SWIG/CMakeLists.txt @@ -32,8 +32,8 @@ INCLUDE_DIRECTORIES( ${Boost_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_BINARY_DIR}/salome_adm - ${CMAKE_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR}/salome_adm + ${PROJECT_BINARY_DIR}/idl ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../LightApp ${CMAKE_CURRENT_SOURCE_DIR}/../Qtx diff --git a/src/SUITApp/CMakeLists.txt b/src/SUITApp/CMakeLists.txt index 495522ebe..a42319f68 100755 --- a/src/SUITApp/CMakeLists.txt +++ b/src/SUITApp/CMakeLists.txt @@ -24,7 +24,7 @@ INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_BINARY_DIR} + ${PROJECT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../Qtx ${CMAKE_CURRENT_SOURCE_DIR}/../SUIT ${CMAKE_CURRENT_SOURCE_DIR}/../Style diff --git a/src/SVTK/CMakeLists.txt b/src/SVTK/CMakeLists.txt index 70d90ae75..f276fceb5 100755 --- a/src/SVTK/CMakeLists.txt +++ b/src/SVTK/CMakeLists.txt @@ -26,7 +26,7 @@ INCLUDE_DIRECTORIES( ${PTHREAD_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR} + ${PROJECT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../Qtx ${CMAKE_CURRENT_SOURCE_DIR}/../SUIT ${CMAKE_CURRENT_SOURCE_DIR}/../ViewerTools diff --git a/src/SalomeApp/CMakeLists.txt b/src/SalomeApp/CMakeLists.txt index 66aeb2264..be1199295 100755 --- a/src/SalomeApp/CMakeLists.txt +++ b/src/SalomeApp/CMakeLists.txt @@ -49,7 +49,7 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../TOOLSGUI ${CMAKE_CURRENT_SOURCE_DIR}/../PyInterp ${CMAKE_CURRENT_SOURCE_DIR}/../Session - ${CMAKE_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR}/idl ${CMAKE_CURRENT_SOURCE_DIR}/../Event ${CMAKE_CURRENT_SOURCE_DIR}/../CASCatch ${CMAKE_CURRENT_SOURCE_DIR}/../Prs diff --git a/src/Session/CMakeLists.txt b/src/Session/CMakeLists.txt index 6f8b275a3..349cf669d 100755 --- a/src/Session/CMakeLists.txt +++ b/src/Session/CMakeLists.txt @@ -27,8 +27,8 @@ INCLUDE_DIRECTORIES( ${OMNIORB_INCLUDE_DIR} ${PTHREAD_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/idl - ${CMAKE_BINARY_DIR} + ${PROJECT_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../Qtx ${CMAKE_CURRENT_SOURCE_DIR}/../SUIT ${CMAKE_CURRENT_SOURCE_DIR}/../Event diff --git a/src/TOOLSGUI/CMakeLists.txt b/src/TOOLSGUI/CMakeLists.txt index 8417f66f2..8e3f507cf 100755 --- a/src/TOOLSGUI/CMakeLists.txt +++ b/src/TOOLSGUI/CMakeLists.txt @@ -26,7 +26,7 @@ INCLUDE_DIRECTORIES( ${Boost_INCLUDE_DIRS} ${PTHREAD_INCLUDE_DIRS} ${KERNEL_INCLUDE_DIRS} - ${CMAKE_BINARY_DIR}/idl + ${PROJECT_BINARY_DIR}/idl ${CMAKE_CURRENT_SOURCE_DIR}/../Qtx ${CMAKE_CURRENT_SOURCE_DIR}/../SUIT) diff --git a/src/TreeData/Test/CMakeLists.txt b/src/TreeData/Test/CMakeLists.txt index e9f92d433..2f9dc2146 100755 --- a/src/TreeData/Test/CMakeLists.txt +++ b/src/TreeData/Test/CMakeLists.txt @@ -23,8 +23,8 @@ INCLUDE_DIRECTORIES( ${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR} ${KERNEL_INCLUDE_DIRS} - ${CMAKE_SOURCE_DIR}/src/GuiHelpers - ${CMAKE_SOURCE_DIR}/src/TreeData + ${PROJECT_SOURCE_DIR}/src/GuiHelpers + ${PROJECT_SOURCE_DIR}/src/TreeData ) SET(COMMON_LIBS -- 2.39.2