Updates to compile on Ubuntu 16.04

Author: ncollier

IsoModel/src/CMakeLists.txt

@@ -1,7 +1,7 @@
 project(isomodel_project)
 set(target_name isomodel)
 
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.1)
 
 set(${target_name}_test
   Test/HourlyModel_GTest.cpp
@@ -75,11 +75,15 @@ set(${target_name}_src
 
 set (library_name isomodel)
 
+# OR CMAKE_SYSTEM_NAME STREQUAL "Linux"
+
 if(MSVC)
   set(Boost_USE_STATIC_LIBS ON)
 else()
-  set(COMPILE_FLAGS "-std=c++11")
-  set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} ${COMPILE_FLAGS})  
+  set(CMAKE_CXX_STANDARD 11)
+  set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} ${COMPILE_FLAGS})
+  # required for googletest
+  FIND_PACKAGE ( Threads REQUIRED )
 endif()
 
 
@@ -109,7 +113,7 @@ target_link_libraries(${exec_name} ${${target_name}_depends})
 
 add_executable(isomodel_unit_tests ${${target_name}_src} ${${target_name}_test})
 target_include_directories(isomodel_unit_tests PUBLIC ${GTEST_INCLUDE_DIRS})
-target_link_libraries(isomodel_unit_tests ${unit_test_depends})
+target_link_libraries(isomodel_unit_tests ${unit_test_depends} ${CMAKE_THREAD_LIBS_INIT})
 
 add_executable(isomodel_benchmark ${${target_name}_src} ${${target_name}_benchmark})
 target_link_libraries(isomodel_benchmark ${benchmark_depends})
@@ -118,9 +122,9 @@ add_executable(solar_debug ${${target_name}_src} ${${target_name}_solar_debug})
 target_link_libraries(solar_debug ${${target_name}_depends})
 
 # define USE_NEW_BUILDING_PARAMS if we are compiling the unit test target
-# this allows use to test parsing the as yet unused parameters 
+# this allows use to test parsing the as yet unused parameters
 set_property(
-  TARGET isomodel_unit_tests 
+  TARGET isomodel_unit_tests
   PROPERTY COMPILE_DEFINITIONS USE_NEW_BUILDING_PARAMS
 )
 
@@ -134,6 +138,6 @@ add_custom_command(TARGET isomodel_unit_tests
 add_library(${library_name} SHARED ${${target_name}_src})
 target_link_libraries(${library_name} ${${target_name}_depends})
 
-if (MSVC) 
+if (MSVC)
  target_compile_options(${library_name} PRIVATE "-Dopenstudio_isomodel_EXPORTS")
 endif()