From 5828d4510816948b034aa9afdf0b7b05659a9f59 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Wed, 16 May 2018 11:34:06 +0100 Subject: [PATCH] BUG: incorrect test for CATALYST_HAS_WORKING_DIRECTORY - LINK_LIBRARIES are required for proper try_compile STYLE: report output directory --- src/catalyst/CMakeLists-Common.txt | 3 +++ src/catalyst/catalystFunctionObject.C | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/catalyst/CMakeLists-Common.txt b/src/catalyst/CMakeLists-Common.txt index 375ec68..8f46668 100644 --- a/src/catalyst/CMakeLists-Common.txt +++ b/src/catalyst/CMakeLists-Common.txt @@ -46,10 +46,13 @@ file(WRITE ${test_file} ) try_compile(CATALYST_HAS_WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ${test_file} + LINK_LIBRARIES vtkPVPythonCatalyst CMAKE_FLAGS "-DINCLUDE_DIRECTORIES=${PARAVIEW_INCLUDE_DIRS}" ) if (CATALYST_HAS_WORKING_DIRECTORY) add_definitions(-DUSE_CATALYST_WORKING_DIRECTORY) +else() + message(WARNING "==== CAUTION: ParaView Catalyst without chdir capability ====") endif() diff --git a/src/catalyst/catalystFunctionObject.C b/src/catalyst/catalystFunctionObject.C index 63adabe..1c697e2 100644 --- a/src/catalyst/catalystFunctionObject.C +++ b/src/catalyst/catalystFunctionObject.C @@ -224,7 +224,8 @@ bool Foam::functionObjects::catalystFunctionObject::read(const dictionary& dict) else { Info<< type() << " " << name() << ":" << nl - << " scripts " << scripts_ << nl + << " output: " << outputDir_ << nl + << " scripts: " << scripts_ << nl << " inputs:" << nl << "(" << nl; -- GitLab