From 69e5ccf8408925cbbb336ef553395ba5297d1910 Mon Sep 17 00:00:00 2001
From: Steven Hahn <hahnse@ornl.gov>
Date: Mon, 19 Oct 2015 14:39:49 -0400
Subject: [PATCH] Refs #14013. Define preprocessor directive project-wide.
---
Framework/Geometry/CMakeLists.txt | 2 --
buildconfig/CMake/CommonSetup.cmake | 5 +++++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/Framework/Geometry/CMakeLists.txt b/Framework/Geometry/CMakeLists.txt
index 495488fdd9f..a39937ee027 100644
--- a/Framework/Geometry/CMakeLists.txt
+++ b/Framework/Geometry/CMakeLists.txt
@@ -398,10 +398,8 @@ endif(UNITY_BUILD)
# ===================== Open Cascade ===================
if (ENABLE_OPENCASCADE)
- find_package ( OpenCascade REQUIRED )
include_directories ( system ${OPENCASCADE_INCLUDE_DIR} )
set (SRC_FILES ${SRC_FILES} ${OPENCASCADE_SRC} )
- add_definitions ( -DENABLE_OPENCASCADE )
endif ()
# A few defines needed for OpenCascade on the Mac
diff --git a/buildconfig/CMake/CommonSetup.cmake b/buildconfig/CMake/CommonSetup.cmake
index d85ffa3b0b5..0079ceee3b6 100644
--- a/buildconfig/CMake/CommonSetup.cmake
+++ b/buildconfig/CMake/CommonSetup.cmake
@@ -57,6 +57,11 @@ find_package ( MuParser REQUIRED )
find_package ( JsonCPP REQUIRED )
include_directories ( SYSTEM ${JSONCPP_INCLUDE_DIR} )
+if (ENABLE_OPENCASCADE)
+ find_package ( OpenCascade REQUIRED )
+ add_definitions ( -DENABLE_OPENCASCADE )
+endif ()
+
find_package ( Doxygen ) # optional
# Need to change search path to find zlib include on Windows.
--
GitLab