Merge remote-tracking branch 'origin/develop' into ResultsSchema

NREL · Mar 5, 2015 · e0ca38f · e0ca38f · nrel-bot · Mar 5, 2015
2 parents 9ff83d8 + 2d81698
commit e0ca38f
Show file tree

Hide file tree

Showing 51 changed files with 41,488 additions and 2,177 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,7 +6,7 @@ set( CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH}
 
 set( CMAKE_VERSION_MAJOR 8 )
 set( CMAKE_VERSION_MINOR 2 )
-set( CMAKE_VERSION_PATCH 9 ) 
+set( CMAKE_VERSION_PATCH 10 ) 
 
 set( ENERGYPLUS_VERSION "${CMAKE_VERSION_MAJOR}.${CMAKE_VERSION_MINOR}.${CMAKE_VERSION_PATCH}" )
 
@@ -87,6 +87,10 @@ if (MSVC)
   set(gtest_force_shared_crt ON)
 endif()
 
+if (MINGW)
+  set(CMAKE_SHARED_LIBRARY_PREFIX "")
+endif ()
+
 set( CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/Products" )
 set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/Products" )
 set( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/Products" )