Merge pull request #137 from GEOSX/feature/corbett/enable_chai

Feature/corbett/enable chai
GEOS-DEV · Aug 28, 2018 · 7e30a93 · 7e30a93
2 parents d7dd2bf + 0c7dc65
commit 7e30a93
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 18 deletions.
diff --git a/src/cmake/thirdparty/SetupGeosxThirdParty.cmake b/src/cmake/thirdparty/SetupGeosxThirdParty.cmake
@@ -147,26 +147,30 @@ set( thirdPartyLibs ${thirdPartyLibs} raja )
 ################################
 # CHAI
 ################################
-if( EXISTS ${CHAI_DIR})
-    message("Using system CHAI found at ${CHAI_DIR}")
-    set(CHAI_FOUND TRUE)
+if( ${ENABLE_CHAI})
+  if( EXISTS ${CHAI_DIR})
+      message("Using system CHAI found at ${CHAI_DIR}")
+      set(CHAI_FOUND TRUE)
+  else()
+      message(INFO ": Using CHAI from thirdPartyLibs")
+      set(CHAI_DIR ${GEOSX_TPL_DIR}/chai)
+  endif()
+
+  include(${CMAKE_SOURCE_DIR}/cmake/thirdparty/FindCHAI.cmake)
+  if ( NOT CHAI_FOUND)
+      message(FATAL_ERROR ": CHAI not found in ${CHAI_DIR}. Maybe you need to build it")
+  endif()    
+
+  blt_register_library( NAME chai
+                        INCLUDES ${CHAI_INCLUDE_DIRS}
+                        LIBRARIES ${CHAI_LIBRARY}
+                        TREAT_INCLUDES_AS_SYSTEM ON )
+
+  set( thirdPartyLibs ${thirdPartyLibs} chai )
 else()
-    message(INFO ": Using CHAI from thirdPartyLibs")
-    set(CHAI_DIR ${GEOSX_TPL_DIR}/chai)
+  message("Not using CHAI")
 endif()
 
-include(${CMAKE_SOURCE_DIR}/cmake/thirdparty/FindCHAI.cmake)
-if (NOT CHAI_FOUND)
-    message(FATAL_ERROR ": CHAI not found in ${CHAI_DIR}. Maybe you need to build it")
-endif()    
-
-blt_register_library( NAME chai
-                      INCLUDES ${CHAI_INCLUDE_DIRS}
-                      LIBRARIES ${CHAI_LIBRARY}
-                      TREAT_INCLUDES_AS_SYSTEM ON )
-
-set( thirdPartyLibs ${thirdPartyLibs} chai )  
-
 
 ################################
 # FPARSER

diff --git a/src/components/cxx-utilities b/src/components/cxx-utilities
+5 −1		src/CMakeLists.txt
+91 −6		src/src/ChaiVector.hpp
+0 −50		src/tests/testChaiVector.cpp
+0 −88		src/tests/testManagedArray.cpp