From 1de2d7b052b01fbdc6663a54af023d44573cbefa Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Tue, 25 Apr 2017 10:04:39 +0200
Subject: [PATCH] [CMake] Replaced CMAKE_BINARY_DIR with PROJECT_BINARY_DIR.
---
Applications/Utils/Tests.cmake | 8 ++++----
Documentation/Doxyfile.in | 4 ++--
scripts/cmake/Coverage.cmake | 2 +-
scripts/cmake/ExternalProjectBoost.cmake | 2 +-
scripts/cmake/ExternalProjectCatalyst.cmake | 4 ++--
scripts/cmake/ExternalProjectEigen.cmake | 2 +-
scripts/cmake/ExternalProjectVtk.cmake | 4 ++--
scripts/cmake/packaging/ArchiveTestdata.cmake | 2 +-
scripts/cmake/packaging/PackagingMacros.cmake | 2 +-
scripts/cmake/test/Test.cmake | 2 +-
10 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/Applications/Utils/Tests.cmake b/Applications/Utils/Tests.cmake
index b138cfee042..2c568c8732b 100644
--- a/Applications/Utils/Tests.cmake
+++ b/Applications/Utils/Tests.cmake
@@ -3,7 +3,7 @@ AddTest(
NAME MapGeometryToMeshSurface_Ammer
PATH MeshGeoToolsLib/Ammer/
EXECUTABLE MapGeometryToMeshSurface
- EXECUTABLE_ARGS -m Ammer-Homogen100m-Final-TopSurface.vtu -i Ammer-Rivers.gml -o ${CMAKE_BINARY_DIR}/Tests/Data/MeshGeoToolsLib/Ammer/Ammer-Rivers-Mapped.gml
+ EXECUTABLE_ARGS -m Ammer-Homogen100m-Final-TopSurface.vtu -i Ammer-Rivers.gml -o ${PROJECT_BINARY_DIR}/Tests/Data/MeshGeoToolsLib/Ammer/Ammer-Rivers-Mapped.gml
TESTER diff
REQUIREMENTS NOT OGS_USE_MPI
DIFF_DATA Ammer-Rivers-Mapped.gml
@@ -13,7 +13,7 @@ AddTest(
NAME LARGE_MapGeometryToMeshSurface_Bode
PATH MeshGeoToolsLib/Bode/
EXECUTABLE MapGeometryToMeshSurface
- EXECUTABLE_ARGS -m BodeComplex.msh -i BodeEZG_Fliessgewaesser.gml -o ${CMAKE_BINARY_DIR}/Tests/Data/MeshGeoToolsLib/Bode/BodeEZG_Fliessgewaesser-Mapped.gml
+ EXECUTABLE_ARGS -m BodeComplex.msh -i BodeEZG_Fliessgewaesser.gml -o ${PROJECT_BINARY_DIR}/Tests/Data/MeshGeoToolsLib/Bode/BodeEZG_Fliessgewaesser-Mapped.gml
REQUIREMENTS NOT OGS_USE_MPI
TESTER diff
DIFF_DATA BodeEZG_Fliessgewaesser-Mapped.gml
@@ -23,7 +23,7 @@ AddTest(
NAME LARGE_MapGeometryToMeshSurface_Naegelstedt
PATH MeshGeoToolsLib/Naegelstedt
EXECUTABLE MapGeometryToMeshSurface
- EXECUTABLE_ARGS -m SmallTest.vtu -i RiverNetwork.gml -o ${CMAKE_BINARY_DIR}/Tests/Data/MeshGeoToolsLib/Naegelstedt/RiverNetwork-Mapped.gml
+ EXECUTABLE_ARGS -m SmallTest.vtu -i RiverNetwork.gml -o ${PROJECT_BINARY_DIR}/Tests/Data/MeshGeoToolsLib/Naegelstedt/RiverNetwork-Mapped.gml
REQUIREMENTS NOT OGS_USE_MPI
TESTER diff
DIFF_DATA RiverNetwork-Mapped.gml
@@ -33,7 +33,7 @@ AddTest(
NAME postLIE
PATH LIE/PostProcessing
EXECUTABLE postLIE
- EXECUTABLE_ARGS -i single_joint_pcs_0.pvd -o ${CMAKE_BINARY_DIR}/Tests/Data/LIE/PostProcessing/post_single_joint_pcs_0.pvd
+ EXECUTABLE_ARGS -i single_joint_pcs_0.pvd -o ${PROJECT_BINARY_DIR}/Tests/Data/LIE/PostProcessing/post_single_joint_pcs_0.pvd
REQUIREMENTS NOT OGS_USE_MPI
ABSTOL 1e-14 RELTOL 1e-14
TESTER vtkdiff
diff --git a/Documentation/Doxyfile.in b/Documentation/Doxyfile.in
index 387b5f891d0..14ba165db86 100644
--- a/Documentation/Doxyfile.in
+++ b/Documentation/Doxyfile.in
@@ -782,7 +782,7 @@ WARN_LOGFILE = ${OGS_DOXYGEN_LOGFILE}
# Note: If this tag is empty the current directory is searched.
INPUT = ${PROJECT_SOURCE_DIR}/ \
- ${CMAKE_BINARY_DIR}/DocAux/dox
+ ${PROJECT_BINARY_DIR}/DocAux/dox
# This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
@@ -830,7 +830,7 @@ EXCLUDE = ${PROJECT_SOURCE_DIR}/ThirdParty \
${PROJECT_SOURCE_DIR}/Tests \
${PROJECT_SOURCE_DIR}/Documentation/ProjectFile \
${PROJECT_SOURCE_DIR}/web \
- ${CMAKE_BINARY_DIR}/External
+ ${PROJECT_BINARY_DIR}/External
# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
# directories that are symbolic links (a Unix file system feature) are excluded
diff --git a/scripts/cmake/Coverage.cmake b/scripts/cmake/Coverage.cmake
index 6451d46b2e0..ee1c60c300c 100644
--- a/scripts/cmake/Coverage.cmake
+++ b/scripts/cmake/Coverage.cmake
@@ -3,7 +3,7 @@ include(CodeCoverage)
set(COVERAGE_EXCLUDES
'/gpfs0/*'
'/usr/*'
- '${CMAKE_BINARY_DIR}/*'
+ '${PROJECT_BINARY_DIR}/*'
'${PROJECT_SOURCE_DIR}/Tests/*'
'${PROJECT_SOURCE_DIR}/ThirdParty/*'
)
diff --git a/scripts/cmake/ExternalProjectBoost.cmake b/scripts/cmake/ExternalProjectBoost.cmake
index 1f774322385..ab16c24eb19 100644
--- a/scripts/cmake/ExternalProjectBoost.cmake
+++ b/scripts/cmake/ExternalProjectBoost.cmake
@@ -42,7 +42,7 @@ if(NOT Boost_INCLUDE_DIRS)
endif()
ExternalProject_Add(Boost
- PREFIX ${CMAKE_BINARY_DIR}/External/boost
+ PREFIX ${PROJECT_BINARY_DIR}/External/boost
URL ${OGS_BOOST_URL}
URL_MD5 ${OGS_BOOST_MD5}
UPDATE_COMMAND ""
diff --git a/scripts/cmake/ExternalProjectCatalyst.cmake b/scripts/cmake/ExternalProjectCatalyst.cmake
index 8e91b402d67..9d3752dec88 100644
--- a/scripts/cmake/ExternalProjectCatalyst.cmake
+++ b/scripts/cmake/ExternalProjectCatalyst.cmake
@@ -26,7 +26,7 @@ if(ParaView_FOUND)
return()
elseif()
# If nothing was found build ParaView as an external project
- set(ParaView_DIR ${CMAKE_BINARY_DIR}/External/catalyst/src/Catalyst-build CACHE PATH "" FORCE)
+ set(ParaView_DIR ${PROJECT_BINARY_DIR}/External/catalyst/src/Catalyst-build CACHE PATH "" FORCE)
endif()
endif()
@@ -55,7 +55,7 @@ endif()
message(STATUS "Building ParaView as an external project in the build directory")
ExternalProject_Add(Catalyst
- PREFIX ${CMAKE_BINARY_DIR}/External/catalyst
+ PREFIX ${PROJECT_BINARY_DIR}/External/catalyst
GIT_REPOSITORY ${CATALYST_GIT_URL}
CONFIGURE_COMMAND ../Catalyst/${CATALYST_CONFIGURE_COMMAND} -G ${CATALYST_CMAKE_GENERATOR}
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} ../Catalyst
diff --git a/scripts/cmake/ExternalProjectEigen.cmake b/scripts/cmake/ExternalProjectEigen.cmake
index 4ab33c49cdf..036d235ff38 100644
--- a/scripts/cmake/ExternalProjectEigen.cmake
+++ b/scripts/cmake/ExternalProjectEigen.cmake
@@ -31,7 +31,7 @@ endif()
include(ThirdPartyLibVersions)
include(ExternalProject)
ExternalProject_Add(Eigen
- PREFIX ${CMAKE_BINARY_DIR}/External/eigen
+ PREFIX ${PROJECT_BINARY_DIR}/External/eigen
URL ${OGS_EIGEN_URL}
URL_MD5 ${OGS_EIGEN_MD5}
UPDATE_COMMAND ""
diff --git a/scripts/cmake/ExternalProjectVtk.cmake b/scripts/cmake/ExternalProjectVtk.cmake
index a5d5af6a4e8..a6ed46a8e59 100644
--- a/scripts/cmake/ExternalProjectVtk.cmake
+++ b/scripts/cmake/ExternalProjectVtk.cmake
@@ -42,7 +42,7 @@ if(VTK_FOUND)
include_directories(SYSTEM ${VTK_DIR}/../ThirdParty/netcdf/vtknetcdf/cxx)
return()
endif()
-set(VTK_DIR ${CMAKE_BINARY_DIR}/External/vtk/src/vtk-build CACHE PATH "" FORCE)
+set(VTK_DIR ${PROJECT_BINARY_DIR}/External/vtk/src/vtk-build CACHE PATH "" FORCE)
message(STATUS "Building VTK as an external project in the build directory")
@@ -65,7 +65,7 @@ foreach(arg ${VTK_MODULES})
endforeach()
ExternalProject_Add(vtk
- PREFIX ${CMAKE_BINARY_DIR}/External/vtk
+ PREFIX ${PROJECT_BINARY_DIR}/External/vtk
URL ${OGS_VTK_URL}
CMAKE_ARGS -Wno-dev
CMAKE_CACHE_ARGS ${VTK_CMAKE_ARGS}
diff --git a/scripts/cmake/packaging/ArchiveTestdata.cmake b/scripts/cmake/packaging/ArchiveTestdata.cmake
index 018c1e2fa86..3cb44e44dbf 100644
--- a/scripts/cmake/packaging/ArchiveTestdata.cmake
+++ b/scripts/cmake/packaging/ArchiveTestdata.cmake
@@ -13,6 +13,6 @@ endif()
add_custom_target(archive-data
bash ${PROJECT_SOURCE_DIR}/scripts/packaging/archive-testdata.sh
DEPENDS data
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+ WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
COMMENT "Packaging testdata to ogs6-data.tar.gz and ogs6-data.zip" VERBATIM
)
diff --git a/scripts/cmake/packaging/PackagingMacros.cmake b/scripts/cmake/packaging/PackagingMacros.cmake
index e1325e9c792..45398b51651 100644
--- a/scripts/cmake/packaging/PackagingMacros.cmake
+++ b/scripts/cmake/packaging/PackagingMacros.cmake
@@ -50,7 +50,7 @@ function(DownloadAdditionalFilesForPackaging)
foreach(URL ${DownloadAdditionalFilesForPackaging_URLS})
get_filename_component(FILE_NAME ${URL} NAME)
get_filename_component(FILE_EXTENSION ${URL} EXT)
- set(FILE_PATH ${CMAKE_BINARY_DIR}/AdditionalContent/${FILE_NAME})
+ set(FILE_PATH ${PROJECT_BINARY_DIR}/AdditionalContent/${FILE_NAME})
if(NOT EXISTS ${FILE_PATH})
file(DOWNLOAD ${URL} ${FILE_PATH} SHOW_PROGRESS)
endif()
diff --git a/scripts/cmake/test/Test.cmake b/scripts/cmake/test/Test.cmake
index 9d751b588a2..f8671a88a73 100644
--- a/scripts/cmake/test/Test.cmake
+++ b/scripts/cmake/test/Test.cmake
@@ -31,7 +31,7 @@ enable_testing() # Enable CTest
set(CTEST_CUSTOM_TESTS_IGNORE test-harness) # ignore logog test
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/scripts/cmake/test/CTestCustom.cmake.in
- ${CMAKE_BINARY_DIR}/CTestCustom.cmake
+ ${PROJECT_BINARY_DIR}/CTestCustom.cmake
)
include(${CMAKE_CURRENT_SOURCE_DIR}/scripts/cmake/test/AddTest.cmake)
--
GitLab