Merge branch 'develop' of github.com:NREL/EnergyPlus into cmake_moder…

…nize
NREL · Dec 19, 2020 · fde2e65 · fde2e65 · nrel-bot-3 · Dec 19, 2020
2 parents 9407ee0 + ebdb919
commit fde2e65
Show file tree

Hide file tree

Showing 557 changed files with 26,088 additions and 28,527 deletions.
diff --git a/.github/workflows/pr_labels.yml b/.github/workflows/pr_labels.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   check_pr_labels:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
     steps:
       - name: Checkout
         uses: actions/checkout@v2

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -239,6 +239,11 @@ target_include_directories(project_options SYSTEM INTERFACE "${kiva_SOURCE_DIR}/
 
 add_subdirectory(scripts/dev/generate_embeddable_epJSON_schema)
 set_target_properties(generate_embeddedable_epJSON_schema PROPERTIES FOLDER "Internal")
+
+if( OPENGL_FOUND )
+  set(BUILD_PENUMBRA_TESTING OFF CACHE BOOL "")
+endif()
+
 # E+ required libraries
 add_subdirectory(idd)
 
@@ -290,7 +295,7 @@ if(BUILD_TESTING)
 
   set_target_properties(btwxt_tests PROPERTIES FOLDER ThirdParty/Btwxt)
   set_target_properties(kiva_tests PROPERTIES FOLDER ThirdParty/Kiva)
-  if(OPENGL_FOUND)
+  if( OPENGL_FOUND AND BUILD_PENUMBRA_TESTING)
     set_target_properties(penumbra_tests PROPERTIES FOLDER ThirdParty/Penumbra)
   endif()
 endif()