From d42650a32fb461415a96b4d86bbf3932722f27fb Mon Sep 17 00:00:00 2001 From: Michael Hansen Date: Sat, 14 Feb 2015 10:30:57 -0800 Subject: [PATCH] Disable pfPythonTest on non-Windows until it can be built and linked without the Windows-specific pieces. --- Sources/Plasma/PubUtilLib/plPipeline/plPipelineCreatable.h | 2 ++ Sources/Tests/FeatureTests/CMakeLists.txt | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Sources/Plasma/PubUtilLib/plPipeline/plPipelineCreatable.h b/Sources/Plasma/PubUtilLib/plPipeline/plPipelineCreatable.h index ba2e36ab..c6248791 100644 --- a/Sources/Plasma/PubUtilLib/plPipeline/plPipelineCreatable.h +++ b/Sources/Plasma/PubUtilLib/plPipeline/plPipelineCreatable.h @@ -45,11 +45,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com #include "pnFactory/plCreator.h" +#ifdef HS_BUILD_FOR_WIN32 #include #include "DX/plDXPipeline.h" REGISTER_NONCREATABLE( plDXPipeline ); +#endif #include "hsFogControl.h" diff --git a/Sources/Tests/FeatureTests/CMakeLists.txt b/Sources/Tests/FeatureTests/CMakeLists.txt index 2b204bc9..293fe91e 100644 --- a/Sources/Tests/FeatureTests/CMakeLists.txt +++ b/Sources/Tests/FeatureTests/CMakeLists.txt @@ -1 +1,3 @@ -add_subdirectory(pfPythonTest) +if(WIN32) + add_subdirectory(pfPythonTest) +endif()