Skip to content

Commit

Permalink
Refs #4606 option to NOT use opencascade since
Browse files Browse the repository at this point in the history
it is such a huge dependency to build
  • Loading branch information
Janik Zikovsky committed Jan 22, 2012
1 parent c256425 commit a1e4e35
Showing 1 changed file with 21 additions and 9 deletions.
30 changes: 21 additions & 9 deletions Code/Mantid/Framework/Geometry/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,6 @@ set ( SRC_FILES
src/Rendering/GeometryHandler.cpp
src/Rendering/GluGeometryHandler.cpp
src/Rendering/GluGeometryRenderer.cpp
src/Rendering/OCGeometryGenerator.cpp
src/Rendering/OCGeometryHandler.cpp
src/Rendering/OCGeometryRenderer.cpp
src/Rendering/vtkGeometryCacheReader.cpp
src/Rendering/vtkGeometryCacheWriter.cpp
src/Surfaces/Cone.cpp
Expand All @@ -81,6 +78,12 @@ set ( SRC_FILES
src/Surfaces/Torus.cpp
)

set ( OPENCASCADE_SRC
src/Rendering/OCGeometryGenerator.cpp
src/Rendering/OCGeometryHandler.cpp
src/Rendering/OCGeometryRenderer.cpp
)

set ( SRC_UNITY_IGNORE_FILES src/Instrument/CompAssembly.cpp
src/Instrument/ObjCompAssembly.cpp
src/Rendering/OCGeometryHandler.cpp
Expand Down Expand Up @@ -267,17 +270,22 @@ if ( NOT OPENGL_FOUND )
message ( FATAL_ERROR "OpenGL was not found." )
endif ()

find_package ( OpenCascade REQUIRED )

include_directories ( ${OPENCASCADE_INCLUDE_DIR} )
include_directories ( ${OPENGL_INCLUDE_DIR} )
include_directories ( ${GSL_INCLUDE_DIR} )
# ===================== Open Cascade ===================
if (NOT NO_OPENCASCADE)
find_package ( OpenCascade REQUIRED )
include_directories ( ${OPENCASCADE_INCLUDE_DIR} )
set (SRC_FILES ${SRC_FILES} ${OPENCASCADE_SRC} )
endif ()

# A few defines needed for OpenCascade on the Mac
if ( APPLE )
add_definitions ( -DHAVE_IOSTREAM -DHAVE_LIMITS -DHAVE_IOMANIP )
endif ()

include_directories ( ${OPENGL_INCLUDE_DIR} )
include_directories ( ${GSL_INCLUDE_DIR} )


# Add a precompiled header where they are supported
ADD_PRECOMPILED_HEADER( inc/MantidGeometry/PrecompiledHeader.h MantidGeometry src/PrecompiledHeader.cpp SRC_FILES INC_FILES )
# Add the target for this directory
Expand All @@ -288,7 +296,11 @@ set_target_properties ( Geometry PROPERTIES OUTPUT_NAME MantidGeometry
# Add to the 'Framework' group in VS
set_property ( TARGET Geometry PROPERTY FOLDER "MantidFramework" )

target_link_libraries ( Geometry ${MANTIDLIBS} ${OPENCASCADE_LIBRARIES} ${OPENGL_LIBRARIES} ${GSL_LIBRARIES} )
target_link_libraries ( Geometry ${MANTIDLIBS} ${OPENGL_LIBRARIES} ${GSL_LIBRARIES} )

if (NOT NO_OPENCASCADE)
target_link_libraries ( Geometry ${OPENCASCADE_LIBRARIES} )
endif ()

if ( CXXTEST_FOUND )
# This is required to pick up ComponentCreationHelper, which is the only TestHelpers class that may be
Expand Down

0 comments on commit a1e4e35

Please sign in to comment.