CMake: replacing CMAKE_* variables by PROJECT_* variables.

diff --git a/doc/salome/gui/CMakeLists.txt b/doc/salome/gui/CMakeLists.txt
index 1abb0f4c3ec12441dbf3e98d41a1cb8dba405c18..b5b5263765d28a1ea00d45fbc169a3a219d765f2 100755 (executable)
--- 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 a1a2161a64fd7c158a7004406a7b72d014ba28e1..56bf225714b07fd64d23ccb2face2ea4d4517cd9 100755 (executable)
--- 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 f03e66d732b527ad6043a0a405cb1cff83ce55d3..e4ee23899f72e04c7b334b15799431388c3ad9b6 100755 (executable)
--- 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 a0a25ab3b7f9b3f9c31f955b9feb3e8c605d379f..7585deb455d9044e9d07934b800938487b020284 100755 (executable)
--- 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 b840065ae55ed879268b7480b70db7c6ff99e754..a44d04ecc86d359f7d9325c7df9494ce422098f1 100755 (executable)
--- 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 9f7d67b46572791783587b8bfb950d03e26332af..3c5560d073a3860199fdca47b8f1046e4cddf17f 100755 (executable)
--- 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 dcb2550755cb7a6acbc473b6642b2f0421220c1c..5dfd50f1941ae503f7feb46ee0b1f8200fb5af3d 100755 (executable)
--- 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 495522ebe6a8b03bac6bac25a12c4bcaeab04e65..a42319f6815f1684921ba2032d4e765b3711d221 100755 (executable)
--- 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 70d90ae75760e77461ce8f96db2ea3e63c3fb00d..f276fceb5148e29191ca3830272ab20ee196012c 100755 (executable)
--- 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 66aeb22642d222c2a199ede0a4c6bd57f7916b7f..be11992954611d5ccda656558b3a72c7fc5d8a34 100755 (executable)
--- 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 6f8b275a386b1948b2879436d6f94dd1ada20a4b..349cf669d0e961f2096591bc000a9975053be04e 100755 (executable)
--- 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 8417f66f23895697b74c33aa1ee9ad5c6dbb3846..8e3f507cfee60eabff29cd5f80a0119c76779ff3 100755 (executable)
--- 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 e9f92d433214dd6591ea36fca17ced5dc3974ea9..2f9dc2146a775f101c57032aab89304e99193cdd 100755 (executable)
--- 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