Undo stray change to clean up the merge

NREL · Nov 3, 2014 · 4e19d13 · 4e19d13 · nrel-bot · Nov 3, 2014
1 parent 37ecfec
commit 4e19d13
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -98,12 +98,6 @@ INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/third_party/ObjexxFCL/src/ )
 INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/third_party/SQLite/ SYSTEM )
 INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/third_party/Expat" "${CMAKE_SOURCE_DIR}/third_party/Expat/lib" SYSTEM)
 
-if( BUILD_TESTING )
-  option( TEST_ANNUAL_SIMULATION "Use annual simulations for tests instead of only design days" OFF )
-  enable_testing()
-  include(CTest)
-endif()
-
 # E+ required libraries
 ADD_SUBDIRECTORY(third_party/SQLite)
 ADD_SUBDIRECTORY(third_party/ObjexxFCL)
@@ -120,6 +114,9 @@ ENDIF()
 ADD_SUBDIRECTORY(src/EnergyPlus)
 
 if( BUILD_TESTING )
+  option( TEST_ANNUAL_SIMULATION "Use annual simulations for tests instead of only design days" OFF )
+  enable_testing()
+  include(CTest)
   ADD_SUBDIRECTORY(third_party/gtest)
   ADD_SUBDIRECTORY(testfiles)
   ADD_SUBDIRECTORY(tst/EnergyPlus/unit)