diff --git a/CMakeLists.txt b/CMakeLists.txt index 48a4c00c55c..40d6b907c13 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,8 +35,6 @@ target_link_libraries(project_options INTERFACE Threads::Threads) include(cmake/Sanitizers.cmake) enable_sanitizers(project_options) - - include(cmake/Version.cmake) set(OPENGL_REQUIRED @@ -208,7 +206,6 @@ include(cmake/CompilerFlags.cmake) add_subdirectory(third_party) - target_include_directories(project_options INTERFACE ${PROJECT_SOURCE_DIR}/src) target_include_directories(project_options INTERFACE ${PROJECT_SOURCE_DIR}/third_party) target_include_directories(project_options INTERFACE ${PROJECT_SOURCE_DIR}/third_party/btwxt/src) @@ -237,19 +234,18 @@ target_include_directories(project_options INTERFACE ${PROJECT_SOURCE_DIR}/third target_include_directories(project_options INTERFACE "${kiva_BINARY_DIR}/src/libkiva") target_include_directories(project_options SYSTEM INTERFACE "${kiva_SOURCE_DIR}/vendor/boost-1.61.0/") - 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 "") +if(OPENGL_FOUND) + set(BUILD_PENUMBRA_TESTING + OFF + CACHE BOOL "") endif() # E+ required libraries add_subdirectory(idd) - - execute_process( COMMAND ${PYTHON_EXECUTABLE} "${PROJECT_SOURCE_DIR}/scripts/dev/generate_epJSON_schema/generate_epJSON_schema.py" "${PROJECT_SOURCE_DIR}" TIMEOUT 30 @@ -298,7 +294,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 AND BUILD_PENUMBRA_TESTING) + if(OPENGL_FOUND AND BUILD_PENUMBRA_TESTING) set_target_properties(penumbra_tests PROPERTIES FOLDER ThirdParty/Penumbra) endif() endif() diff --git a/cmake/CMakeAddFortranSubdirectory.cmake b/cmake/CMakeAddFortranSubdirectory.cmake index 46586a6cf62..4d0e1bbf15e 100644 --- a/cmake/CMakeAddFortranSubdirectory.cmake +++ b/cmake/CMakeAddFortranSubdirectory.cmake @@ -51,10 +51,8 @@ include(CMakeParseArguments) function(_setup_mingw_config_and_build source_dir build_dir) # Look for a MinGW gfortran. - find_program( - MINGW_GFORTRAN - NAMES gfortran - PATHS c:/MinGW/bin "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\MinGW;InstallLocation]/bin") + find_program(MINGW_GFORTRAN NAMES gfortran + PATHS c:/MinGW/bin "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\MinGW;InstallLocation]/bin") if(NOT MINGW_GFORTRAN) message(FATAL_ERROR "gfortran not found, please install MinGW with the gfortran option." "Or set the cache variable MINGW_GFORTRAN to the full path. " " This is required to build") @@ -149,10 +147,7 @@ function(cmake_add_fortran_subdirectory subdir) # create imported targets for all libraries foreach(lib ${libraries}) add_library(${lib} SHARED IMPORTED GLOBAL) - set_property( - TARGET ${lib} - APPEND - PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG) + set_property(TARGET ${lib} APPEND PROPERTY IMPORTED_CONFIGURATIONS NOCONFIG) set_target_properties(${lib} PROPERTIES IMPORTED_IMPLIB_NOCONFIG "${library_dir}/lib${lib}.lib" IMPORTED_LOCATION_NOCONFIG "${binary_dir}/lib${lib}.dll") add_dependencies(${lib} ${project_name}_build) diff --git a/cmake/CMakeCPackOptions.cmake.in b/cmake/CMakeCPackOptions.cmake.in index 5a85571fd4e..9bf27274b9f 100644 --- a/cmake/CMakeCPackOptions.cmake.in +++ b/cmake/CMakeCPackOptions.cmake.in @@ -7,7 +7,8 @@ if(CPACK_GENERATOR MATCHES "NSIS") set(CPACK_NSIS_PACKAGE_NAME "${CPACK_PACKAGING_INSTALL_PREFIX}") set(CPACK_NSIS_INSTALL_ROOT "C:") set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGING_INSTALL_PREFIX}") - set(CPACK_NSIS_DEFINES " + set(CPACK_NSIS_DEFINES + " !define MUI_STARTMENUPAGE_DEFAULTFOLDER \"${CPACK_PACKAGING_INSTALL_PREFIX} Programs\" !include \"LogicLib.nsh\" !include \"x64.nsh\" @@ -15,19 +16,29 @@ if(CPACK_GENERATOR MATCHES "NSIS") set(CPACK_PACKAGING_INSTALL_PREFIX "") set(CPACK_NSIS_MENU_LINKS - "Documentation/index.html" "EnergyPlus Documentation" - "PostProcess/EP-Compare/EP-Compare.exe" "EP-Compare" - "PreProcess/EPDraw/EPDrawGUI.exe" "EPDrawGUI" - "EP-Launch.exe" "EP-Launch" - "ExampleFiles/ExampleFiles.html" "Example Files Summary" - "ExampleFiles/ExampleFiles-ObjectsLink.html" "ExampleFiles Link to Objects" - "PreProcess/IDFEditor/IDFEditor.exe" "IDFEditor" - "PreProcess/IDFVersionUpdater/IDFVersionUpdater.exe" "IDFVersionUpdater" - "readme.html" "Readme Notes" - "PreProcess/WeatherConverter/Weather.exe" "Weather Statistics and Conversions" - ) - - set(CPACK_NSIS_PAGE_COMPONENTS " + "Documentation/index.html" + "EnergyPlus Documentation" + "PostProcess/EP-Compare/EP-Compare.exe" + "EP-Compare" + "PreProcess/EPDraw/EPDrawGUI.exe" + "EPDrawGUI" + "EP-Launch.exe" + "EP-Launch" + "ExampleFiles/ExampleFiles.html" + "Example Files Summary" + "ExampleFiles/ExampleFiles-ObjectsLink.html" + "ExampleFiles Link to Objects" + "PreProcess/IDFEditor/IDFEditor.exe" + "IDFEditor" + "PreProcess/IDFVersionUpdater/IDFVersionUpdater.exe" + "IDFVersionUpdater" + "readme.html" + "Readme Notes" + "PreProcess/WeatherConverter/Weather.exe" + "Weather Statistics and Conversions") + + set(CPACK_NSIS_PAGE_COMPONENTS + " !define MUI_FINISHPAGE_RUN !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED !define MUI_FINISHPAGE_SHOWREADME \"$INSTDIR\\readme.html\" @@ -64,7 +75,8 @@ if(CPACK_GENERATOR MATCHES "NSIS") FunctionEnd ") - set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS " + set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS + " WriteRegStr HKEY_CURRENT_USER \"Software\\VB and VBA Program Settings\\EP-Launch\\UpdateCheck\" \"AutoCheck\" \"True\" WriteRegStr HKEY_CURRENT_USER \"Software\\VB and VBA Program Settings\\EP-Launch\\UpdateCheck\" \"CheckURL\" \"http://nrel.github.io/EnergyPlus/epupdate.htm\" StrCpy $0 \"#@CPACK_PACKAGE_VERSION_MAJOR@.@CPACK_PACKAGE_VERSION_MINOR@.@CPACK_PACKAGE_VERSION_PATCH@-@CPACK_PACKAGE_VERSION_BUILD@\" @@ -164,7 +176,8 @@ if(CPACK_GENERATOR MATCHES "NSIS") \${EndIf} RMDir /r $INSTDIR\\temp ") - set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS " + set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS + " MessageBox MB_YESNO|MB_ICONEXCLAMATION \"The installer copied the following files to the system directory during installation:$\\r$\\n$\\r$\\nMSCOMCTL.OCX$\\r$\\nComDlg32.OCX$\\r$\\nMsvcrtd.dll$\\r$\\nDforrt.dll$\\r$\\nGswdll32.dll$\\r$\\nGsw32.exe$\\r$\\nGraph32.ocx$\\r$\\nMSINET.OCX$\\r$\\nVsflex7L.ocx$\\r$\\nMsflxgrd.ocx$\\r$\\n$\\r$\\nThese files may be in use by other programs. Click Yes to remove these files. If you are unsure, click No.\" IDYES true IDNO false true: \${If} \${RunningX64} @@ -211,8 +224,7 @@ endif() if("${CPACK_GENERATOR}" STREQUAL "PackageMaker") set(CPACK_PACKAGE_RELOCATABLE false) - set( CPACK_PACKAGE_VENDOR "usdoe" ) + set(CPACK_PACKAGE_VENDOR "usdoe") configure_file(@CMAKE_SOURCE_DIR@/cmake/CPack.Info.plist.in.in "@CMAKE_BINARY_DIR@/Modules/CPack.Info.plist.in") set(CPACK_RESOURCE_FILE_README "@CMAKE_SOURCE_DIR@/release/readme.html") endif() - diff --git a/cmake/CompilerFlags.cmake b/cmake/CompilerFlags.cmake index 2c6ec74ffe0..de817beaeec 100644 --- a/cmake/CompilerFlags.cmake +++ b/cmake/CompilerFlags.cmake @@ -36,16 +36,17 @@ if(MSVC AND NOT ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")) # Visual C++ (VS # 4355 Passing this pointer in class initializer (object is incomplete so bases/members can only use this in limited ways) # 4996 Deprecated functions (/D_SCL_SECURE_NO_WARNINGS /D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_WARNINGS) # 4503 The decorated name was longer than the compiler limit (4096), and was truncated. - target_compile_options(project_warnings INTERFACE - /wd4068 - /wd4101 - /wd4102 - /wd4244 - /wd4258 - /wd4267 - /wd4355 - /wd4996 - /wd4503) # Disables warning messages listed above + target_compile_options( + project_warnings + INTERFACE /wd4068 + /wd4101 + /wd4102 + /wd4244 + /wd4258 + /wd4267 + /wd4355 + /wd4996 + /wd4503) # Disables warning messages listed above target_compile_definitions(project_options INTERFACE NOMINMAX) # Avoid build errors due to STL/Windows min-max conflicts target_compile_definitions(project_options INTERFACE WIN32_LEAN_AND_MEAN) # Excludes rarely used services and headers from compilation @@ -59,14 +60,12 @@ if(MSVC AND NOT ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")) # Visual C++ (VS target_compile_options(project_options INTERFACE $<$:/RTCsu>) # Runtime checks target_compile_options(project_fp_options INTERFACE $<$:/fp:strict>) # Floating point model target_compile_options(project_options INTERFACE $<$:/DMSVC_DEBUG>) # Triggers code in main.cc to catch floating point NaNs -elseif( - CMAKE_COMPILER_IS_GNUCXX - OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" - OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang") # g++/Clang +elseif(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang") # g++/Clang # COMPILER FLAGS target_compile_options(project_options INTERFACE -pipe) # Faster compiler processing - target_compile_options(project_warnings INTERFACE -Wpedantic) # Turn on warnings about constructs/situations that may be non-portable or outside of the standard + target_compile_options(project_warnings INTERFACE -Wpedantic + )# Turn on warnings about constructs/situations that may be non-portable or outside of the standard target_compile_options(project_warnings INTERFACE -Wall -Wextra) # Turn on warnings target_compile_options(project_warnings INTERFACE -Wno-unknown-pragmas) if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 9.0) @@ -115,7 +114,8 @@ elseif(WIN32 AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel") target_compile_options(project_options INTERFACE /nologo) # Skip banner text target_compile_options(project_options INTERFACE /Qcxx-features) # Enables standard C++ features without disabling Microsoft extensions target_compile_options(project_options INTERFACE /Wall) # Enable all warnings - target_compile_options(project_options INTERFACE /Qdiag-disable:161,177,488,809,869,1786,2259,3280,10382,11074,11075) # Disable warnings listed above + + target_compile_options(project_options INTERFACE /Qdiag-disable:161,177,488,809,869,1786,2259,3280,10382,11074,11075) target_compile_definitions(project_options INTERFACE /DNOMINMAX) # Avoid build errors due to STL/Windows min-max conflicts target_compile_definitions(project_options INTERFACE /DWIN32_LEAN_AND_MEAN) # Excludes rarely used services and headers from compilation @@ -135,12 +135,17 @@ elseif(WIN32 AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel") # ADDITIONAL DEBUG-MODE-SPECIFIC FLAGS target_compile_options(project_fp_options INTERFACE $<$:/fp:source>) # Use source-specified floating point precision - - target_compile_options(project_options INTERFACE $<$:/Qtrapuv>) # Initialize local variables to unusual values to help detect use uninitialized - target_compile_options(project_options INTERFACE $<$:/check:stack,uninit)# Enables runtime checking of the stack (buffer over and underruns; pointer verification>) and uninitialized variables + + # Initialize local variables to unusual values to help detect use uninitialized + target_compile_options(project_options INTERFACE $<$:/Qtrapuv>) + + # Enables runtime checking of the stack (buffer over and underruns; pointer verification>) and uninitialized variables + target_compile_options(project_options INTERFACE $<$:/check:stack,uninit) target_compile_options(project_options INTERFACE $<$:/Gs0>) # Enable stack checking for all functions target_compile_options(project_options INTERFACE $<$:/GS>) # Buffer overrun detection - target_compile_options(project_fp_options INTERFACE $<$:/Qfp-stack-check>)# Tells the compiler to generate extra code after every function call to ensure fp stack is as expected + + # Tells the compiler to generate extra code after every function call to ensure fp stack is as expected + target_compile_options(project_fp_options INTERFACE $<$:/Qfp-stack-check>) target_compile_options(project_options INTERFACE $<$:/traceback>) # Enables traceback on error elseif(UNIX AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel") @@ -160,7 +165,7 @@ elseif(UNIX AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel") # COMPILER FLAGS target_compile_options(project_warnings INTERFACE -Wall) # Enable all warnings - target_compile_options(project_warnings INTERFACE -diag-disable:161,177,488,809,869,1786,2259,3280,10382,11074,11075) # Disable warnings listed above + target_compile_options(project_warnings INTERFACE -diag-disable:161,177,488,809,869,1786,2259,3280,10382,11074,11075)# Disable warnings listed above # Optimization options that had no significant benefit for EnergyPlus # -ipo instead of -ip @@ -177,10 +182,13 @@ elseif(UNIX AND "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel") target_compile_options(project_options INTERFACE $<$:-inline-factor=225>) # Enables more aggressive inlining # ADDITIONAL DEBUG-MODE-SPECIFIC FLAGS - target_compile_options(project_options INTERFACE $<$:-strict-ansi>) # Strict language conformance: Performance impact so limit to debug build + # Strict language conformance: Performance impact so limit to debug build + target_compile_options(project_options INTERFACE $<$:-strict-ansi>) target_compile_options(project_fp_options INTERFACE $<$:-fp-model source>) # Use source-specified floating point precision - target_compile_options(project_options INTERFACE $<$:-ftrapuv>) # Initialize local variables to unusual values to help detect use uninitialized - target_compile_options(project_options INTERFACE $<$:-check=stack,uninit)# Enables runtime checking of the stack (buffer over and underruns; pointer verification>) and uninitialized variables + # Initialize local variables to unusual values to help detect use uninitialized + target_compile_options(project_options INTERFACE $<$:-ftrapuv>) + # Enables runtime checking of the stack (buffer over and underruns; pointer verification>) and uninitialized variables + target_compile_options(project_options INTERFACE $<$:-check=stack,uninit) target_compile_options(project_options INTERFACE $<$:-fstack-security-check>) # Buffer overrun detection target_compile_options(project_fp_options INTERFACE $<$:-fp-stack-check>) # Check the floating point stack after every function call target_compile_options(project_options INTERFACE $<$:-traceback>) # Enables traceback on error diff --git a/cmake/Fortran.cmake b/cmake/Fortran.cmake index eddf1918ba0..c5fffcc3b54 100644 --- a/cmake/Fortran.cmake +++ b/cmake/Fortran.cmake @@ -1,4 +1,3 @@ - add_library(fortran_project_options INTERFACE) set(FORTRAN_STATIC_EXE FALSE) set(FORTRAN_SKIP_RPATH FALSE) @@ -39,4 +38,3 @@ else() # Windows endif() endif() target_compile_options(fortran_project_options INTERFACE -ffree-line-length-275) - diff --git a/cmake/Install.cmake b/cmake/Install.cmake index 4b6ba21f2fa..4f0cf7f189a 100644 --- a/cmake/Install.cmake +++ b/cmake/Install.cmake @@ -16,102 +16,54 @@ if(UNIX) # Set everything to off for now - set(CPACK_BINARY_DEB - OFF - CACHE BOOL "Recommended OFF") - set(CPACK_BINARY_FREEBSD - OFF - CACHE BOOL "Recommended OFF") - set(CPACK_BINARY_RPM - OFF - CACHE BOOL "Recommended OFF") - set(CPACK_BINARY_TBZ2 - OFF - CACHE BOOL "Recommended OFF") - set(CPACK_BINARY_NSIS - OFF - CACHE BOOL "Recommended OFF") + set(CPACK_BINARY_DEB OFF CACHE BOOL "Recommended OFF") + set(CPACK_BINARY_FREEBSD OFF CACHE BOOL "Recommended OFF") + set(CPACK_BINARY_RPM OFF CACHE BOOL "Recommended OFF") + set(CPACK_BINARY_TBZ2 OFF CACHE BOOL "Recommended OFF") + set(CPACK_BINARY_NSIS OFF CACHE BOOL "Recommended OFF") if(APPLE) - set(CPACK_BINARY_IFW - ON - CACHE BOOL "Enable to build IFW package, which is the recommended method") - set(CPACK_BINARY_STGZ - OFF - CACHE BOOL "Recommended OFF") + set(CPACK_BINARY_IFW ON CACHE BOOL "Enable to build IFW package, which is the recommended method") + set(CPACK_BINARY_STGZ OFF CACHE BOOL "Recommended OFF") # Mac Specific options to turn off - set(CPACK_BINARY_BUNDLE - OFF - CACHE BOOL "Recommended OFF") - set(CPACK_BINARY_DRAGNDROP - OFF - CACHE BOOL "Recommended OFF") - set(CPACK_BINARY_OSXX11 - OFF - CACHE BOOL "Recommended OFF") - set(CPACK_BINARY_PACKAGEMAKER - OFF - CACHE BOOL "This was the legacy method on Apple, superseded by IFW") - set(CPACK_BINARY_PRODUCTBUILD - OFF - CACHE BOOL "Recommended OFF") + set(CPACK_BINARY_BUNDLE OFF CACHE BOOL "Recommended OFF") + set(CPACK_BINARY_DRAGNDROP OFF CACHE BOOL "Recommended OFF") + set(CPACK_BINARY_OSXX11 OFF CACHE BOOL "Recommended OFF") + set(CPACK_BINARY_PACKAGEMAKER OFF CACHE BOOL "This was the legacy method on Apple, superseded by IFW") + set(CPACK_BINARY_PRODUCTBUILD OFF CACHE BOOL "Recommended OFF") else() # TODO: Make IFW recommended? Deprecate STGZ? - set(CPACK_BINARY_IFW - ON - CACHE BOOL "Enable to build IFW package, which is the recommended method") - set(CPACK_BINARY_STGZ - ON - CACHE BOOL "Enable to build a Linux sh installer script, which is the legacy method") + set(CPACK_BINARY_IFW ON CACHE BOOL "Enable to build IFW package, which is the recommended method") + set(CPACK_BINARY_STGZ ON CACHE BOOL "Enable to build a Linux sh installer script, which is the legacy method") # Unix (non Apple CACHE BOOL) specific option to turn off - set(CPACK_BINARY_TZ - OFF - CACHE BOOL "Recommended OFF") + set(CPACK_BINARY_TZ OFF CACHE BOOL "Recommended OFF") endif() # TODO: the "FORCE" is temporary to avoid people having an existing build directory miss the fact that the recommended method changed # TODO: remove after next release if(UNIX AND NOT APPLE) if(NOT CPACK_BINARY_IFW) - set(CPACK_BINARY_STGZ - OFF - CACHE BOOL "This was the legacy method on Linux, superseded by IFW" FORCE) - set(CPACK_BINARY_IFW - ON - CACHE BOOL "Enable to build IFW package, which is the recommend method" FORCE) + set(CPACK_BINARY_STGZ OFF CACHE BOOL "This was the legacy method on Linux, superseded by IFW" FORCE) + set(CPACK_BINARY_IFW ON CACHE BOOL "Enable to build IFW package, which is the recommend method" FORCE) message("Switching from STGZ to IFW as the supported generator has changed on Linux") endif() endif() # END TODO # Tar.gz for inclusion in other programs for eg - set(CPACK_BINARY_TGZ - ON - CACHE BOOL "Enable to build a tar.gz package, recommended for an official release") + set(CPACK_BINARY_TGZ ON CACHE BOOL "Enable to build a tar.gz package, recommended for an official release") elseif(WIN32) - set(CPACK_BINARY_IFW - ON - CACHE BOOL "Enable to build IFW package, which is the recommend method") - set(CPACK_BINARY_ZIP - ON - CACHE BOOL "Enable to build a ZIP package, recommended for an official release") - - set(CPACK_BINARY_NSIS - OFF - CACHE BOOL "This was the legacy method on Windows, superseded by IFW") - set(CPACK_BINARY_7Z - OFF - CACHE BOOL "Recommended OFF") - set(CPACK_BINARY_NUGET - OFF - CACHE BOOL "Recommended OFF") - set(CPACK_BINARY_WIX - OFF - CACHE BOOL "Recommended OFF") + set(CPACK_BINARY_IFW ON CACHE BOOL "Enable to build IFW package, which is the recommend method") + set(CPACK_BINARY_ZIP ON CACHE BOOL "Enable to build a ZIP package, recommended for an official release") + + set(CPACK_BINARY_NSIS OFF CACHE BOOL "This was the legacy method on Windows, superseded by IFW") + set(CPACK_BINARY_7Z OFF CACHE BOOL "Recommended OFF") + set(CPACK_BINARY_NUGET OFF CACHE BOOL "Recommended OFF") + set(CPACK_BINARY_WIX OFF CACHE BOOL "Recommended OFF") endif() @@ -123,33 +75,17 @@ endif() # Instead use indiv CPACK_SOURCE_: all to OFF if(UNIX) - set(CPACK_SOURCE_RPM - OFF - CACHE BOOL "Recommended OFF") - set(CPACK_SOURCE_TBZ2 - OFF - CACHE BOOL "Recommended OFF") - set(CPACK_SOURCE_TGZ - OFF - CACHE BOOL "Recommended OFF") - set(CPACK_SOURCE_TXZ - OFF - CACHE BOOL "Recommended OFF") - set(CPACK_SOURCE_TZ - OFF - CACHE BOOL "Recommended OFF") - set(CPACK_SOURCE_ZIP - OFF - CACHE BOOL "Recommended OFF") + set(CPACK_SOURCE_RPM OFF CACHE BOOL "Recommended OFF") + set(CPACK_SOURCE_TBZ2 OFF CACHE BOOL "Recommended OFF") + set(CPACK_SOURCE_TGZ OFF CACHE BOOL "Recommended OFF") + set(CPACK_SOURCE_TXZ OFF CACHE BOOL "Recommended OFF") + set(CPACK_SOURCE_TZ OFF CACHE BOOL "Recommended OFF") + set(CPACK_SOURCE_ZIP OFF CACHE BOOL "Recommended OFF") elseif(WIN32) - set(CPACK_SOURCE_7Z - OFF - CACHE BOOL "Recommended OFF") - set(CPACK_SOURCE_ZIP - OFF - CACHE BOOL "Recommended OFF") + set(CPACK_SOURCE_7Z OFF CACHE BOOL "Recommended OFF") + set(CPACK_SOURCE_ZIP OFF CACHE BOOL "Recommended OFF") endif() ###################################################################################################################################################### @@ -173,9 +109,9 @@ if(BUILD_FORTRAN) endif() # Need to install the ssc lib... -install( TARGETS ssc DESTINATION ./ ) +install(TARGETS ssc DESTINATION ./) -set(CPACK_PACKAGE_VENDOR "US Department of Energy" ) +set(CPACK_PACKAGE_VENDOR "US Department of Energy") set(CPACK_IFW_PACKAGE_PUBLISHER "${CPACK_PACKAGE_VENDOR}") set(CPACK_PACKAGE_CONTACT "Edwin Lee ") @@ -270,16 +206,10 @@ elseif(UNIX) # OS_RELEASE is the result of `uname -r` which is unhelpful (eg '5.4.0-42-generic') find_program(LSB_RELEASE lsb_release) # -rs outputs only 16.04, or 18.04 - execute_process( - COMMAND ${LSB_RELEASE} -rs - OUTPUT_VARIABLE LSB_RELEASE_VERSION_SHORT - OUTPUT_STRIP_TRAILING_WHITESPACE) + execute_process(COMMAND ${LSB_RELEASE} -rs OUTPUT_VARIABLE LSB_RELEASE_VERSION_SHORT OUTPUT_STRIP_TRAILING_WHITESPACE) # -is outputs "Ubuntu" or "Fedora" - execute_process( - COMMAND ${LSB_RELEASE} -is - OUTPUT_VARIABLE LSB_RELEASE_ID_SHORT - OUTPUT_STRIP_TRAILING_WHITESPACE) + execute_process(COMMAND ${LSB_RELEASE} -is OUTPUT_VARIABLE LSB_RELEASE_ID_SHORT OUTPUT_STRIP_TRAILING_WHITESPACE) # eg: `-Ubuntu18.04` set(SYSTEM_VERSION "-${LSB_RELEASE_ID_SHORT}${LSB_RELEASE_VERSION_SHORT}") @@ -309,10 +239,7 @@ if(WIN32 AND NOT UNIX) endif() endif() -install( - FILES "${PROJECT_SOURCE_DIR}/LICENSE.txt" - DESTINATION "./" - COMPONENT Licenses) +install(FILES "${PROJECT_SOURCE_DIR}/LICENSE.txt" DESTINATION "./" COMPONENT Licenses) set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE.txt") install(FILES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Energy+.idd" DESTINATION ./) @@ -335,19 +262,13 @@ install(FILES "${PROJECT_BINARY_DIR}/autodocs/SetupOutputVariables.csv" DESTINAT install( CODE "execute_process(COMMAND \"${PYTHON_EXECUTABLE}\" \"${PROJECT_SOURCE_DIR}/doc/tools/example_file_summary.py\" \"${PROJECT_SOURCE_DIR}/testfiles\" \"${DOCS_OUT}/ExampleFiles.html\")" COMPONENT ExampleFiles) -install( - FILES "${DOCS_OUT}/ExampleFiles.html" - DESTINATION "./ExampleFiles/" - COMPONENT ExampleFiles) +install(FILES "${DOCS_OUT}/ExampleFiles.html" DESTINATION "./ExampleFiles/" COMPONENT ExampleFiles) # the example file objects link install(CODE "execute_process(COMMAND \"${PYTHON_EXECUTABLE}\" \"${PROJECT_SOURCE_DIR}/doc/tools/example_file_objects.py\" \"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Energy+.idd\" \"${PROJECT_SOURCE_DIR}/testfiles\" \"${DOCS_OUT}/ExampleFiles-ObjectsLink.html\")" COMPONENT ExampleFiles) -install( - FILES "${DOCS_OUT}/ExampleFiles-ObjectsLink.html" - DESTINATION "./ExampleFiles/" - COMPONENT ExampleFiles) +install(FILES "${DOCS_OUT}/ExampleFiles-ObjectsLink.html" DESTINATION "./ExampleFiles/" COMPONENT ExampleFiles) option(BUILD_CHANGELOG "Build a changelog for this package -- requires GITHUB_TOKEN in environment" OFF) if(BUILD_CHANGELOG) @@ -358,10 +279,7 @@ if(BUILD_CHANGELOG) install( CODE "execute_process(COMMAND \"${PYTHON_EXECUTABLE}\" \"${PROJECT_SOURCE_DIR}/doc/tools/create_changelog.py\" \"${PROJECT_SOURCE_DIR}\" \"${DOCS_OUT}/changelog.md\" \"${DOCS_OUT}/changelog.html\" \"${GIT_EXECUTABLE}\" \"$ENV{GITHUB_TOKEN}\" \"${PREV_RELEASE_SHA}\" \"${CPACK_PACKAGE_VERSION}\")" ) - install( - FILES "${DOCS_OUT}/changelog.html" - DESTINATION "./" - OPTIONAL) + install(FILES "${DOCS_OUT}/changelog.html" DESTINATION "./" OPTIONAL) else() message(WARNING "No GITHUB_TOKEN found in environment; package won't include the change log") endif() @@ -370,275 +288,80 @@ endif() # BUILD_CHANGELOG ################################################################# D A T A S E T S ################################################################## # Install files that are in the current repo -install( - FILES "${PROJECT_SOURCE_DIR}/datasets/AirCooledChiller.idf" - DESTINATION "./DataSets" - COMPONENT Datasets) -install( - FILES "${PROJECT_SOURCE_DIR}/datasets/ASHRAE_2005_HOF_Materials.idf" - DESTINATION "./DataSets" - COMPONENT Datasets) -install( - FILES "${PROJECT_SOURCE_DIR}/datasets/Boilers.idf" - DESTINATION "./DataSets" - COMPONENT Datasets) -install( - FILES "${PROJECT_SOURCE_DIR}/datasets/California_Title_24-2008.idf" - DESTINATION "./DataSets" - COMPONENT Datasets) -install( - FILES "${PROJECT_SOURCE_DIR}/datasets/Chillers.idf" - DESTINATION "./DataSets" - COMPONENT Datasets) -install( - FILES "${PROJECT_SOURCE_DIR}/datasets/CompositeWallConstructions.idf" - DESTINATION "./DataSets" - COMPONENT Datasets) -install( - FILES "${PROJECT_SOURCE_DIR}/datasets/DXCoolingCoil.idf" - DESTINATION "./DataSets" - COMPONENT Datasets) -install( - FILES "${PROJECT_SOURCE_DIR}/datasets/ElectricGenerators.idf" - DESTINATION "./DataSets" - COMPONENT Datasets) -install( - FILES "${PROJECT_SOURCE_DIR}/datasets/ElectricityUSAEnvironmentalImpactFactors.idf" - DESTINATION "./DataSets" - COMPONENT Datasets) -install( - FILES "${PROJECT_SOURCE_DIR}/datasets/ElectronicEnthalpyEconomizerCurves.idf" - DESTINATION "./DataSets" - COMPONENT Datasets) -install( - FILES "${PROJECT_SOURCE_DIR}/datasets/ExhaustFiredChiller.idf" - DESTINATION "./DataSets" - COMPONENT Datasets) -install( - FILES "${PROJECT_SOURCE_DIR}/datasets/FluidPropertiesRefData.idf" - DESTINATION "./DataSets" - COMPONENT Datasets) -install( - FILES "${PROJECT_SOURCE_DIR}/datasets/FossilFuelEnvironmentalImpactFactors.idf" - DESTINATION "./DataSets" - COMPONENT Datasets) -install( - FILES "${PROJECT_SOURCE_DIR}/datasets/GLHERefData.idf" - DESTINATION "./DataSets" - COMPONENT Datasets) -install( - FILES "${PROJECT_SOURCE_DIR}/datasets/GlycolPropertiesRefData.idf" - DESTINATION "./DataSets" - COMPONENT Datasets) -install( - FILES "${PROJECT_SOURCE_DIR}/datasets/LCCusePriceEscalationDataSet2012.idf" - DESTINATION "./DataSets" - COMPONENT Datasets) -install( - FILES "${PROJECT_SOURCE_DIR}/datasets/LCCusePriceEscalationDataSet2013.idf" - DESTINATION "./DataSets" - COMPONENT Datasets) -install( - FILES "${PROJECT_SOURCE_DIR}/datasets/LCCusePriceEscalationDataSet2014.idf" - DESTINATION "./DataSets" - COMPONENT Datasets) -install( - FILES "${PROJECT_SOURCE_DIR}/datasets/LCCusePriceEscalationDataSet2015.idf" - DESTINATION "./DataSets" - COMPONENT Datasets) -install( - FILES "${PROJECT_SOURCE_DIR}/datasets/LCCusePriceEscalationDataSet2016.idf" - DESTINATION "./DataSets" - COMPONENT Datasets) -install( - FILES "${PROJECT_SOURCE_DIR}/datasets/LCCusePriceEscalationDataSet2017.idf" - DESTINATION "./DataSets" - COMPONENT Datasets) -install( - FILES "${PROJECT_SOURCE_DIR}/datasets/LCCusePriceEscalationDataSet2018.idf" - DESTINATION "./DataSets" - COMPONENT Datasets) -install( - FILES "${PROJECT_SOURCE_DIR}/datasets/LCCusePriceEscalationDataSet2019.idf" - DESTINATION "./DataSets" - COMPONENT Datasets) -install( - FILES "${PROJECT_SOURCE_DIR}/datasets/MoistureMaterials.idf" - DESTINATION "./DataSets" - COMPONENT Datasets) -install( - FILES "${PROJECT_SOURCE_DIR}/datasets/PerfCurves.idf" - DESTINATION "./DataSets" - COMPONENT Datasets) -install( - FILES "${PROJECT_SOURCE_DIR}/datasets/PrecipitationSchedulesUSA.idf" - DESTINATION "./DataSets" - COMPONENT Datasets) -install( - FILES "${PROJECT_SOURCE_DIR}/datasets/RefrigerationCasesDataSet.idf" - DESTINATION "./DataSets" - COMPONENT Datasets) -install( - FILES "${PROJECT_SOURCE_DIR}/datasets/RefrigerationCompressorCurves.idf" - DESTINATION "./DataSets" - COMPONENT Datasets) -install( - FILES "${PROJECT_SOURCE_DIR}/datasets/ResidentialACsAndHPsPerfCurves.idf" - DESTINATION "./DataSets" - COMPONENT Datasets) -install( - FILES "${PROJECT_SOURCE_DIR}/datasets/RooftopPackagedHeatPump.idf" - DESTINATION "./DataSets" - COMPONENT Datasets) -install( - FILES "${PROJECT_SOURCE_DIR}/datasets/SandiaPVdata.idf" - DESTINATION "./DataSets" - COMPONENT Datasets) -install( - FILES "${PROJECT_SOURCE_DIR}/datasets/Schedules.idf" - DESTINATION "./DataSets" - COMPONENT Datasets) -install( - FILES "${PROJECT_SOURCE_DIR}/datasets/SolarCollectors.idf" - DESTINATION "./DataSets" - COMPONENT Datasets) -install( - FILES "${PROJECT_SOURCE_DIR}/datasets/StandardReports.idf" - DESTINATION "./DataSets" - COMPONENT Datasets) -install( - FILES "${PROJECT_SOURCE_DIR}/datasets/SurfaceColorSchemes.idf" - DESTINATION "./DataSets" - COMPONENT Datasets) -install( - FILES "${PROJECT_SOURCE_DIR}/datasets/USHolidays-DST.idf" - DESTINATION "./DataSets" - COMPONENT Datasets) -install( - FILES "${PROJECT_SOURCE_DIR}/datasets/Window5DataFile.dat" - DESTINATION "./DataSets" - COMPONENT Datasets) -install( - FILES "${PROJECT_SOURCE_DIR}/datasets/WindowBlindMaterials.idf" - DESTINATION "./DataSets" - COMPONENT Datasets) -install( - FILES "${PROJECT_SOURCE_DIR}/datasets/WindowConstructs.idf" - DESTINATION "./DataSets" - COMPONENT Datasets) -install( - FILES "${PROJECT_SOURCE_DIR}/datasets/WindowGasMaterials.idf" - DESTINATION "./DataSets" - COMPONENT Datasets) -install( - FILES "${PROJECT_SOURCE_DIR}/datasets/WindowGlassMaterials.idf" - DESTINATION "./DataSets" - COMPONENT Datasets) -install( - FILES "${PROJECT_SOURCE_DIR}/datasets/WindowScreenMaterials.idf" - DESTINATION "./DataSets" - COMPONENT Datasets) -install( - FILES "${PROJECT_SOURCE_DIR}/datasets/WindowShadeMaterials.idf" - DESTINATION "./DataSets" - COMPONENT Datasets) -install( - FILES "${PROJECT_SOURCE_DIR}/datasets/FMUs/MoistAir.fmu" - DESTINATION "./DataSets/FMUs" - COMPONENT Datasets) -install( - FILES "${PROJECT_SOURCE_DIR}/datasets/FMUs/ShadingController.fmu" - DESTINATION "./DataSets/FMUs" - COMPONENT Datasets) -install( - FILES "${PROJECT_SOURCE_DIR}/datasets/TDV/TDV_2008_kBtu_CTZ06.csv" - DESTINATION "./DataSets/TDV" - COMPONENT Datasets) -install( - FILES "${PROJECT_SOURCE_DIR}/datasets/TDV/TDV_read_me.txt" - DESTINATION "./DataSets/TDV" - COMPONENT Datasets) - -install( - FILES "${PROJECT_SOURCE_DIR}/datasets/Macro/Locations-DesignDays.xls" - DESTINATION "./MacroDataSets" - COMPONENT Datasets) -install( - FILES "${PROJECT_SOURCE_DIR}/datasets/Macro/SandiaPVdata.imf" - DESTINATION "./MacroDataSets" - COMPONENT Datasets) -install( - FILES "${PROJECT_SOURCE_DIR}/datasets/Macro/SolarCollectors.imf" - DESTINATION "./MacroDataSets" - COMPONENT Datasets) -install( - FILES "${PROJECT_SOURCE_DIR}/datasets/Macro/UtilityTariffObjects.imf" - DESTINATION "./MacroDataSets" - COMPONENT Datasets) +install(FILES "${PROJECT_SOURCE_DIR}/datasets/AirCooledChiller.idf" DESTINATION "./DataSets" COMPONENT Datasets) +install(FILES "${PROJECT_SOURCE_DIR}/datasets/ASHRAE_2005_HOF_Materials.idf" DESTINATION "./DataSets" COMPONENT Datasets) +install(FILES "${PROJECT_SOURCE_DIR}/datasets/Boilers.idf" DESTINATION "./DataSets" COMPONENT Datasets) +install(FILES "${PROJECT_SOURCE_DIR}/datasets/California_Title_24-2008.idf" DESTINATION "./DataSets" COMPONENT Datasets) +install(FILES "${PROJECT_SOURCE_DIR}/datasets/Chillers.idf" DESTINATION "./DataSets" COMPONENT Datasets) +install(FILES "${PROJECT_SOURCE_DIR}/datasets/CompositeWallConstructions.idf" DESTINATION "./DataSets" COMPONENT Datasets) +install(FILES "${PROJECT_SOURCE_DIR}/datasets/DXCoolingCoil.idf" DESTINATION "./DataSets" COMPONENT Datasets) +install(FILES "${PROJECT_SOURCE_DIR}/datasets/ElectricGenerators.idf" DESTINATION "./DataSets" COMPONENT Datasets) +install(FILES "${PROJECT_SOURCE_DIR}/datasets/ElectricityUSAEnvironmentalImpactFactors.idf" DESTINATION "./DataSets" COMPONENT Datasets) +install(FILES "${PROJECT_SOURCE_DIR}/datasets/ElectronicEnthalpyEconomizerCurves.idf" DESTINATION "./DataSets" COMPONENT Datasets) +install(FILES "${PROJECT_SOURCE_DIR}/datasets/ExhaustFiredChiller.idf" DESTINATION "./DataSets" COMPONENT Datasets) +install(FILES "${PROJECT_SOURCE_DIR}/datasets/FluidPropertiesRefData.idf" DESTINATION "./DataSets" COMPONENT Datasets) +install(FILES "${PROJECT_SOURCE_DIR}/datasets/FossilFuelEnvironmentalImpactFactors.idf" DESTINATION "./DataSets" COMPONENT Datasets) +install(FILES "${PROJECT_SOURCE_DIR}/datasets/GLHERefData.idf" DESTINATION "./DataSets" COMPONENT Datasets) +install(FILES "${PROJECT_SOURCE_DIR}/datasets/GlycolPropertiesRefData.idf" DESTINATION "./DataSets" COMPONENT Datasets) +install(FILES "${PROJECT_SOURCE_DIR}/datasets/LCCusePriceEscalationDataSet2012.idf" DESTINATION "./DataSets" COMPONENT Datasets) +install(FILES "${PROJECT_SOURCE_DIR}/datasets/LCCusePriceEscalationDataSet2013.idf" DESTINATION "./DataSets" COMPONENT Datasets) +install(FILES "${PROJECT_SOURCE_DIR}/datasets/LCCusePriceEscalationDataSet2014.idf" DESTINATION "./DataSets" COMPONENT Datasets) +install(FILES "${PROJECT_SOURCE_DIR}/datasets/LCCusePriceEscalationDataSet2015.idf" DESTINATION "./DataSets" COMPONENT Datasets) +install(FILES "${PROJECT_SOURCE_DIR}/datasets/LCCusePriceEscalationDataSet2016.idf" DESTINATION "./DataSets" COMPONENT Datasets) +install(FILES "${PROJECT_SOURCE_DIR}/datasets/LCCusePriceEscalationDataSet2017.idf" DESTINATION "./DataSets" COMPONENT Datasets) +install(FILES "${PROJECT_SOURCE_DIR}/datasets/LCCusePriceEscalationDataSet2018.idf" DESTINATION "./DataSets" COMPONENT Datasets) +install(FILES "${PROJECT_SOURCE_DIR}/datasets/LCCusePriceEscalationDataSet2019.idf" DESTINATION "./DataSets" COMPONENT Datasets) +install(FILES "${PROJECT_SOURCE_DIR}/datasets/MoistureMaterials.idf" DESTINATION "./DataSets" COMPONENT Datasets) +install(FILES "${PROJECT_SOURCE_DIR}/datasets/PerfCurves.idf" DESTINATION "./DataSets" COMPONENT Datasets) +install(FILES "${PROJECT_SOURCE_DIR}/datasets/PrecipitationSchedulesUSA.idf" DESTINATION "./DataSets" COMPONENT Datasets) +install(FILES "${PROJECT_SOURCE_DIR}/datasets/RefrigerationCasesDataSet.idf" DESTINATION "./DataSets" COMPONENT Datasets) +install(FILES "${PROJECT_SOURCE_DIR}/datasets/RefrigerationCompressorCurves.idf" DESTINATION "./DataSets" COMPONENT Datasets) +install(FILES "${PROJECT_SOURCE_DIR}/datasets/ResidentialACsAndHPsPerfCurves.idf" DESTINATION "./DataSets" COMPONENT Datasets) +install(FILES "${PROJECT_SOURCE_DIR}/datasets/RooftopPackagedHeatPump.idf" DESTINATION "./DataSets" COMPONENT Datasets) +install(FILES "${PROJECT_SOURCE_DIR}/datasets/SandiaPVdata.idf" DESTINATION "./DataSets" COMPONENT Datasets) +install(FILES "${PROJECT_SOURCE_DIR}/datasets/Schedules.idf" DESTINATION "./DataSets" COMPONENT Datasets) +install(FILES "${PROJECT_SOURCE_DIR}/datasets/SolarCollectors.idf" DESTINATION "./DataSets" COMPONENT Datasets) +install(FILES "${PROJECT_SOURCE_DIR}/datasets/StandardReports.idf" DESTINATION "./DataSets" COMPONENT Datasets) +install(FILES "${PROJECT_SOURCE_DIR}/datasets/SurfaceColorSchemes.idf" DESTINATION "./DataSets" COMPONENT Datasets) +install(FILES "${PROJECT_SOURCE_DIR}/datasets/USHolidays-DST.idf" DESTINATION "./DataSets" COMPONENT Datasets) +install(FILES "${PROJECT_SOURCE_DIR}/datasets/Window5DataFile.dat" DESTINATION "./DataSets" COMPONENT Datasets) +install(FILES "${PROJECT_SOURCE_DIR}/datasets/WindowBlindMaterials.idf" DESTINATION "./DataSets" COMPONENT Datasets) +install(FILES "${PROJECT_SOURCE_DIR}/datasets/WindowConstructs.idf" DESTINATION "./DataSets" COMPONENT Datasets) +install(FILES "${PROJECT_SOURCE_DIR}/datasets/WindowGasMaterials.idf" DESTINATION "./DataSets" COMPONENT Datasets) +install(FILES "${PROJECT_SOURCE_DIR}/datasets/WindowGlassMaterials.idf" DESTINATION "./DataSets" COMPONENT Datasets) +install(FILES "${PROJECT_SOURCE_DIR}/datasets/WindowScreenMaterials.idf" DESTINATION "./DataSets" COMPONENT Datasets) +install(FILES "${PROJECT_SOURCE_DIR}/datasets/WindowShadeMaterials.idf" DESTINATION "./DataSets" COMPONENT Datasets) +install(FILES "${PROJECT_SOURCE_DIR}/datasets/FMUs/MoistAir.fmu" DESTINATION "./DataSets/FMUs" COMPONENT Datasets) +install(FILES "${PROJECT_SOURCE_DIR}/datasets/FMUs/ShadingController.fmu" DESTINATION "./DataSets/FMUs" COMPONENT Datasets) +install(FILES "${PROJECT_SOURCE_DIR}/datasets/TDV/TDV_2008_kBtu_CTZ06.csv" DESTINATION "./DataSets/TDV" COMPONENT Datasets) +install(FILES "${PROJECT_SOURCE_DIR}/datasets/TDV/TDV_read_me.txt" DESTINATION "./DataSets/TDV" COMPONENT Datasets) + +install(FILES "${PROJECT_SOURCE_DIR}/datasets/Macro/Locations-DesignDays.xls" DESTINATION "./MacroDataSets" COMPONENT Datasets) +install(FILES "${PROJECT_SOURCE_DIR}/datasets/Macro/SandiaPVdata.imf" DESTINATION "./MacroDataSets" COMPONENT Datasets) +install(FILES "${PROJECT_SOURCE_DIR}/datasets/Macro/SolarCollectors.imf" DESTINATION "./MacroDataSets" COMPONENT Datasets) +install(FILES "${PROJECT_SOURCE_DIR}/datasets/Macro/UtilityTariffObjects.imf" DESTINATION "./MacroDataSets" COMPONENT Datasets) ############################################################# W E A T H E R D A T A ############################################################# # weather files -install( - FILES "${PROJECT_SOURCE_DIR}/weather/USA_CA_San.Francisco.Intl.AP.724940_TMY3.ddy" - DESTINATION "./WeatherData" - COMPONENT WeatherData) -install( - FILES "${PROJECT_SOURCE_DIR}/weather/USA_CA_San.Francisco.Intl.AP.724940_TMY3.epw" - DESTINATION "./WeatherData" - COMPONENT WeatherData) -install( - FILES "${PROJECT_SOURCE_DIR}/weather/USA_CA_San.Francisco.Intl.AP.724940_TMY3.stat" - DESTINATION "./WeatherData" - COMPONENT WeatherData) -install( - FILES "${PROJECT_SOURCE_DIR}/weather/USA_CO_Golden-NREL.724666_TMY3.ddy" - DESTINATION "./WeatherData" - COMPONENT WeatherData) -install( - FILES "${PROJECT_SOURCE_DIR}/weather/USA_CO_Golden-NREL.724666_TMY3.epw" - DESTINATION "./WeatherData" - COMPONENT WeatherData) -install( - FILES "${PROJECT_SOURCE_DIR}/weather/USA_CO_Golden-NREL.724666_TMY3.stat" - DESTINATION "./WeatherData" - COMPONENT WeatherData) -install( - FILES "${PROJECT_SOURCE_DIR}/weather/USA_FL_Tampa.Intl.AP.722110_TMY3.ddy" - DESTINATION "./WeatherData" - COMPONENT WeatherData) -install( - FILES "${PROJECT_SOURCE_DIR}/weather/USA_FL_Tampa.Intl.AP.722110_TMY3.epw" - DESTINATION "./WeatherData" - COMPONENT WeatherData) -install( - FILES "${PROJECT_SOURCE_DIR}/weather/USA_FL_Tampa.Intl.AP.722110_TMY3.stat" - DESTINATION "./WeatherData" - COMPONENT WeatherData) -install( - FILES "${PROJECT_SOURCE_DIR}/weather/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.ddy" - DESTINATION "./WeatherData" - COMPONENT WeatherData) -install( - FILES "${PROJECT_SOURCE_DIR}/weather/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw" - DESTINATION "./WeatherData" - COMPONENT WeatherData) -install( - FILES "${PROJECT_SOURCE_DIR}/weather/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.stat" - DESTINATION "./WeatherData" - COMPONENT WeatherData) -install( - FILES "${PROJECT_SOURCE_DIR}/weather/USA_VA_Sterling-Washington.Dulles.Intl.AP.724030_TMY3.ddy" - DESTINATION "./WeatherData" - COMPONENT WeatherData) -install( - FILES "${PROJECT_SOURCE_DIR}/weather/USA_VA_Sterling-Washington.Dulles.Intl.AP.724030_TMY3.epw" - DESTINATION "./WeatherData" - COMPONENT WeatherData) -install( - FILES "${PROJECT_SOURCE_DIR}/weather/USA_VA_Sterling-Washington.Dulles.Intl.AP.724030_TMY3.stat" - DESTINATION "./WeatherData" - COMPONENT WeatherData) +install(FILES "${PROJECT_SOURCE_DIR}/weather/USA_CA_San.Francisco.Intl.AP.724940_TMY3.ddy" DESTINATION "./WeatherData" COMPONENT WeatherData) +install(FILES "${PROJECT_SOURCE_DIR}/weather/USA_CA_San.Francisco.Intl.AP.724940_TMY3.epw" DESTINATION "./WeatherData" COMPONENT WeatherData) +install(FILES "${PROJECT_SOURCE_DIR}/weather/USA_CA_San.Francisco.Intl.AP.724940_TMY3.stat" DESTINATION "./WeatherData" COMPONENT WeatherData) +install(FILES "${PROJECT_SOURCE_DIR}/weather/USA_CO_Golden-NREL.724666_TMY3.ddy" DESTINATION "./WeatherData" COMPONENT WeatherData) +install(FILES "${PROJECT_SOURCE_DIR}/weather/USA_CO_Golden-NREL.724666_TMY3.epw" DESTINATION "./WeatherData" COMPONENT WeatherData) +install(FILES "${PROJECT_SOURCE_DIR}/weather/USA_CO_Golden-NREL.724666_TMY3.stat" DESTINATION "./WeatherData" COMPONENT WeatherData) +install(FILES "${PROJECT_SOURCE_DIR}/weather/USA_FL_Tampa.Intl.AP.722110_TMY3.ddy" DESTINATION "./WeatherData" COMPONENT WeatherData) +install(FILES "${PROJECT_SOURCE_DIR}/weather/USA_FL_Tampa.Intl.AP.722110_TMY3.epw" DESTINATION "./WeatherData" COMPONENT WeatherData) +install(FILES "${PROJECT_SOURCE_DIR}/weather/USA_FL_Tampa.Intl.AP.722110_TMY3.stat" DESTINATION "./WeatherData" COMPONENT WeatherData) +install(FILES "${PROJECT_SOURCE_DIR}/weather/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.ddy" DESTINATION "./WeatherData" COMPONENT WeatherData) +install(FILES "${PROJECT_SOURCE_DIR}/weather/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw" DESTINATION "./WeatherData" COMPONENT WeatherData) +install(FILES "${PROJECT_SOURCE_DIR}/weather/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.stat" DESTINATION "./WeatherData" COMPONENT WeatherData) +install(FILES "${PROJECT_SOURCE_DIR}/weather/USA_VA_Sterling-Washington.Dulles.Intl.AP.724030_TMY3.ddy" DESTINATION "./WeatherData" + COMPONENT WeatherData) +install(FILES "${PROJECT_SOURCE_DIR}/weather/USA_VA_Sterling-Washington.Dulles.Intl.AP.724030_TMY3.epw" DESTINATION "./WeatherData" + COMPONENT WeatherData) +install(FILES "${PROJECT_SOURCE_DIR}/weather/USA_VA_Sterling-Washington.Dulles.Intl.AP.724030_TMY3.stat" DESTINATION "./WeatherData" + COMPONENT WeatherData) ############################################################# E X A M P L E F I L E S ######################################################### @@ -666,10 +389,7 @@ set(CPACK_RESOURCE_FILE_README "${PROJECT_SOURCE_DIR}/release/readme.html") install(FILES "${PROJECT_SOURCE_DIR}/bin/CurveFitTools/IceStorageCurveFitTool.xlsm" DESTINATION "PreProcess/HVACCurveFitTool/") install(FILES "${PROJECT_SOURCE_DIR}/idd/V9-3-0-Energy+.idd" DESTINATION "PreProcess/IDFVersionUpdater/") -install( - FILES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Energy+.idd" - DESTINATION "PreProcess/IDFVersionUpdater/" - RENAME "V9-4-0-Energy+.idd") +install(FILES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Energy+.idd" DESTINATION "PreProcess/IDFVersionUpdater/" RENAME "V9-4-0-Energy+.idd") # Workflow stuff, takes about 40KB, so not worth it proposing to not install it install(FILES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/workflows/app_g_postprocess.py" DESTINATION "workflows/") # COMPONENT Workflows) @@ -771,46 +491,16 @@ if(WIN32) # This copies system DLLs into a temp folder. It is later used by the install script of this specific component # to check if the dll isn't present on the target system, in which case it will copy it to the system folder (eg: C:\Windows\SysWOW64\) # and use the regsvr32.exe to register said DLL. - install( - PROGRAMS "${PROJECT_SOURCE_DIR}/bin/System/ComDlg32.OCX" - DESTINATION "./temp/" - COMPONENT CopyAndRegisterSystemDLLs) - install( - PROGRAMS "${PROJECT_SOURCE_DIR}/bin/System/Dforrt.dll" - DESTINATION "./temp/" - COMPONENT CopyAndRegisterSystemDLLs) - install( - PROGRAMS "${PROJECT_SOURCE_DIR}/bin/System/Graph32.ocx" - DESTINATION "./temp/" - COMPONENT CopyAndRegisterSystemDLLs) - install( - PROGRAMS "${PROJECT_SOURCE_DIR}/bin/System/Gsw32.exe" - DESTINATION "./temp/" - COMPONENT CopyAndRegisterSystemDLLs) - install( - PROGRAMS "${PROJECT_SOURCE_DIR}/bin/System/Gswdll32.dll" - DESTINATION "./temp/" - COMPONENT CopyAndRegisterSystemDLLs) - install( - PROGRAMS "${PROJECT_SOURCE_DIR}/bin/System/MSCOMCTL.OCX" - DESTINATION "./temp/" - COMPONENT CopyAndRegisterSystemDLLs) - install( - PROGRAMS "${PROJECT_SOURCE_DIR}/bin/System/Msflxgrd.ocx" - DESTINATION "./temp/" - COMPONENT CopyAndRegisterSystemDLLs) - install( - PROGRAMS "${PROJECT_SOURCE_DIR}/bin/System/MSINET.OCX" - DESTINATION "./temp/" - COMPONENT CopyAndRegisterSystemDLLs) - install( - PROGRAMS "${PROJECT_SOURCE_DIR}/bin/System/Msvcrtd.dll" - DESTINATION "./temp/" - COMPONENT CopyAndRegisterSystemDLLs) - install( - PROGRAMS "${PROJECT_SOURCE_DIR}/bin/System/Vsflex7L.ocx" - DESTINATION "./temp/" - COMPONENT CopyAndRegisterSystemDLLs) + install(PROGRAMS "${PROJECT_SOURCE_DIR}/bin/System/ComDlg32.OCX" DESTINATION "./temp/" COMPONENT CopyAndRegisterSystemDLLs) + install(PROGRAMS "${PROJECT_SOURCE_DIR}/bin/System/Dforrt.dll" DESTINATION "./temp/" COMPONENT CopyAndRegisterSystemDLLs) + install(PROGRAMS "${PROJECT_SOURCE_DIR}/bin/System/Graph32.ocx" DESTINATION "./temp/" COMPONENT CopyAndRegisterSystemDLLs) + install(PROGRAMS "${PROJECT_SOURCE_DIR}/bin/System/Gsw32.exe" DESTINATION "./temp/" COMPONENT CopyAndRegisterSystemDLLs) + install(PROGRAMS "${PROJECT_SOURCE_DIR}/bin/System/Gswdll32.dll" DESTINATION "./temp/" COMPONENT CopyAndRegisterSystemDLLs) + install(PROGRAMS "${PROJECT_SOURCE_DIR}/bin/System/MSCOMCTL.OCX" DESTINATION "./temp/" COMPONENT CopyAndRegisterSystemDLLs) + install(PROGRAMS "${PROJECT_SOURCE_DIR}/bin/System/Msflxgrd.ocx" DESTINATION "./temp/" COMPONENT CopyAndRegisterSystemDLLs) + install(PROGRAMS "${PROJECT_SOURCE_DIR}/bin/System/MSINET.OCX" DESTINATION "./temp/" COMPONENT CopyAndRegisterSystemDLLs) + install(PROGRAMS "${PROJECT_SOURCE_DIR}/bin/System/Msvcrtd.dll" DESTINATION "./temp/" COMPONENT CopyAndRegisterSystemDLLs) + install(PROGRAMS "${PROJECT_SOURCE_DIR}/bin/System/Vsflex7L.ocx" DESTINATION "./temp/" COMPONENT CopyAndRegisterSystemDLLs) endif() # The group, which will be used to configure the root package @@ -951,66 +641,21 @@ if(BUILD_DOCS) COMPONENT Documentation) endif() - install( - FILES "${PROJECT_BINARY_DIR}/doc/pdf/Acknowledgments.pdf" - DESTINATION "./Documentation" - COMPONENT Documentation) - install( - FILES "${PROJECT_BINARY_DIR}/doc/pdf/AuxiliaryPrograms.pdf" - DESTINATION "./Documentation" - COMPONENT Documentation) - install( - FILES "${PROJECT_BINARY_DIR}/doc/pdf/EMSApplicationGuide.pdf" - DESTINATION "./Documentation" - COMPONENT Documentation) - install( - FILES "${PROJECT_BINARY_DIR}/doc/pdf/EngineeringReference.pdf" - DESTINATION "./Documentation" - COMPONENT Documentation) - install( - FILES "${PROJECT_BINARY_DIR}/doc/pdf/EnergyPlusEssentials.pdf" - DESTINATION "./Documentation" - COMPONENT Documentation) - install( - FILES "${PROJECT_BINARY_DIR}/doc/pdf/ExternalInterfacesApplicationGuide.pdf" - DESTINATION "./Documentation" - COMPONENT Documentation) - install( - FILES "${PROJECT_BINARY_DIR}/doc/pdf/GettingStarted.pdf" - DESTINATION "./Documentation" - COMPONENT Documentation) - install( - FILES "${PROJECT_BINARY_DIR}/doc/pdf/InputOutputReference.pdf" - DESTINATION "./Documentation" - COMPONENT Documentation) - install( - FILES "${PROJECT_BINARY_DIR}/doc/pdf/InterfaceDeveloper.pdf" - DESTINATION "./Documentation" - COMPONENT Documentation) - install( - FILES "${PROJECT_BINARY_DIR}/doc/pdf/ModuleDeveloper.pdf" - DESTINATION "./Documentation" - COMPONENT Documentation) - install( - FILES "${PROJECT_BINARY_DIR}/doc/pdf/OutputDetailsAndExamples.pdf" - DESTINATION "./Documentation" - COMPONENT Documentation) - install( - FILES "${PROJECT_BINARY_DIR}/doc/pdf/PlantApplicationGuide.pdf" - DESTINATION "./Documentation" - COMPONENT Documentation) - install( - FILES "${PROJECT_BINARY_DIR}/doc/pdf/TipsAndTricksUsingEnergyPlus.pdf" - DESTINATION "./Documentation" - COMPONENT Documentation) - install( - FILES "${PROJECT_BINARY_DIR}/doc/pdf/UsingEnergyPlusForCompliance.pdf" - DESTINATION "./Documentation" - COMPONENT Documentation) - install( - FILES "${PROJECT_BINARY_DIR}/doc/pdf/index.html" - DESTINATION "./Documentation" - COMPONENT Documentation) + install(FILES "${PROJECT_BINARY_DIR}/doc/pdf/Acknowledgments.pdf" DESTINATION "./Documentation" COMPONENT Documentation) + install(FILES "${PROJECT_BINARY_DIR}/doc/pdf/AuxiliaryPrograms.pdf" DESTINATION "./Documentation" COMPONENT Documentation) + install(FILES "${PROJECT_BINARY_DIR}/doc/pdf/EMSApplicationGuide.pdf" DESTINATION "./Documentation" COMPONENT Documentation) + install(FILES "${PROJECT_BINARY_DIR}/doc/pdf/EngineeringReference.pdf" DESTINATION "./Documentation" COMPONENT Documentation) + install(FILES "${PROJECT_BINARY_DIR}/doc/pdf/EnergyPlusEssentials.pdf" DESTINATION "./Documentation" COMPONENT Documentation) + install(FILES "${PROJECT_BINARY_DIR}/doc/pdf/ExternalInterfacesApplicationGuide.pdf" DESTINATION "./Documentation" COMPONENT Documentation) + install(FILES "${PROJECT_BINARY_DIR}/doc/pdf/GettingStarted.pdf" DESTINATION "./Documentation" COMPONENT Documentation) + install(FILES "${PROJECT_BINARY_DIR}/doc/pdf/InputOutputReference.pdf" DESTINATION "./Documentation" COMPONENT Documentation) + install(FILES "${PROJECT_BINARY_DIR}/doc/pdf/InterfaceDeveloper.pdf" DESTINATION "./Documentation" COMPONENT Documentation) + install(FILES "${PROJECT_BINARY_DIR}/doc/pdf/ModuleDeveloper.pdf" DESTINATION "./Documentation" COMPONENT Documentation) + install(FILES "${PROJECT_BINARY_DIR}/doc/pdf/OutputDetailsAndExamples.pdf" DESTINATION "./Documentation" COMPONENT Documentation) + install(FILES "${PROJECT_BINARY_DIR}/doc/pdf/PlantApplicationGuide.pdf" DESTINATION "./Documentation" COMPONENT Documentation) + install(FILES "${PROJECT_BINARY_DIR}/doc/pdf/TipsAndTricksUsingEnergyPlus.pdf" DESTINATION "./Documentation" COMPONENT Documentation) + install(FILES "${PROJECT_BINARY_DIR}/doc/pdf/UsingEnergyPlusForCompliance.pdf" DESTINATION "./Documentation" COMPONENT Documentation) + install(FILES "${PROJECT_BINARY_DIR}/doc/pdf/index.html" DESTINATION "./Documentation" COMPONENT Documentation) else() message(AUTHOR_WARNING "BUILD_DOCS isn't enabled, so package won't include the PDFs") endif() @@ -1028,10 +673,7 @@ if(WIN32 AND NOT UNIX) include(InstallRequiredSystemLibraries) if(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS) - install( - PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} - DESTINATION "./" - COMPONENT Libraries) + install(PROGRAMS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} DESTINATION "./" COMPONENT Libraries) endif() endif() @@ -1060,31 +702,17 @@ include(CPackIFW) #REQUIRED #) -cpack_add_component( - Documentation - DISPLAY_NAME "Documentation" - DESCRIPTION "EnergyPlus documentation in PDF format") +cpack_add_component(Documentation DISPLAY_NAME "Documentation" DESCRIPTION "EnergyPlus documentation in PDF format") -cpack_add_component( - Datasets - DISPLAY_NAME "Datasets" - DESCRIPTION "Useful resources such as material and equipment performance data") +cpack_add_component(Datasets DISPLAY_NAME "Datasets" DESCRIPTION "Useful resources such as material and equipment performance data") -cpack_add_component( - ExampleFiles - DISPLAY_NAME "Example Files" - DESCRIPTION "IDF Example Files") +cpack_add_component(ExampleFiles DISPLAY_NAME "Example Files" DESCRIPTION "IDF Example Files") -cpack_add_component( - WeatherData - DISPLAY_NAME "Weather Data" - DESCRIPTION "EPW Weather Files") +cpack_add_component(WeatherData DISPLAY_NAME "Weather Data" DESCRIPTION "EPW Weather Files") # This stuff actually requires admin privileges since touched system locations -cpack_add_component( - Symlinks - DISPLAY_NAME "Create Symlinks - requires admin" - DESCRIPTION "This will symlink the executable to /usr/local/bin and copy the man page") +cpack_add_component(Symlinks DISPLAY_NAME "Create Symlinks - requires admin" + DESCRIPTION "This will symlink the executable to /usr/local/bin and copy the man page") # Could add any upstream library license to this cpack_add_component( @@ -1094,15 +722,10 @@ cpack_add_component( REQUIRED HIDDEN) # No need for system privileges for this -cpack_add_component( - CreateStartMenu - DISPLAY_NAME "Start Menu links" - DESCRIPTION "Create Start Menu Links") +cpack_add_component(CreateStartMenu DISPLAY_NAME "Start Menu links" DESCRIPTION "Create Start Menu Links") -cpack_add_component( - RegisterFileType - DISPLAY_NAME "Associate with EP-Launch and IDFEditor" - DESCRIPTION "Associate *.idf, *.imf, and *.epg files with EP-Launch, *.ddy and *.expidf with IDFEditor.exe") +cpack_add_component(RegisterFileType DISPLAY_NAME "Associate with EP-Launch and IDFEditor" + DESCRIPTION "Associate *.idf, *.imf, and *.epg files with EP-Launch, *.ddy and *.expidf with IDFEditor.exe") cpack_add_component( CopyAndRegisterSystemDLLs @@ -1119,24 +742,12 @@ cpack_add_component( # Regular stuff, like chmod +x cpack_ifw_configure_component(Unspecified SCRIPT cmake/qtifw/install_operations.qs) -cpack_ifw_configure_component( - Symlinks - SCRIPT cmake/qtifw/install_unix_createsymlinks.qs - REQUIRES_ADMIN_RIGHTS) +cpack_ifw_configure_component(Symlinks SCRIPT cmake/qtifw/install_unix_createsymlinks.qs REQUIRES_ADMIN_RIGHTS) cpack_ifw_configure_component(CreateStartMenu SCRIPT cmake/qtifw/install_win_createstartmenu.qs) -cpack_ifw_configure_component( - RegisterFileType - SCRIPT cmake/qtifw/install_registerfiletype.qs - REQUIRES_ADMIN_RIGHTS) +cpack_ifw_configure_component(RegisterFileType SCRIPT cmake/qtifw/install_registerfiletype.qs REQUIRES_ADMIN_RIGHTS) -cpack_ifw_configure_component( - CopyAndRegisterSystemDLLs - SCRIPT cmake/qtifw/install_win_copydll.qs - REQUIRES_ADMIN_RIGHTS) +cpack_ifw_configure_component(CopyAndRegisterSystemDLLs SCRIPT cmake/qtifw/install_win_copydll.qs REQUIRES_ADMIN_RIGHTS) -cpack_ifw_configure_component( - Licenses - FORCED_INSTALLATION - LICENSES "EnergyPlus" ${CPACK_RESOURCE_FILE_LICENSE}) +cpack_ifw_configure_component(Licenses FORCED_INSTALLATION LICENSES "EnergyPlus" ${CPACK_RESOURCE_FILE_LICENSE}) diff --git a/cmake/ProjectMacros.cmake b/cmake/ProjectMacros.cmake index 4e44dd582be..725f3c98035 100644 --- a/cmake/ProjectMacros.cmake +++ b/cmake/ProjectMacros.cmake @@ -44,7 +44,6 @@ macro(CREATE_TEST_TARGETS BASE_NAME SRC DEPENDENCIES) target_compile_options(${BASE_NAME}_tests PRIVATE -diag-disable:1684) endif() - create_src_groups("${SRC}") get_target_property(BASE_NAME_TYPE ${BASE_NAME} TYPE) @@ -169,7 +168,6 @@ function(ADD_SIMULATION_TEST) endfunction() - function(fixup_executable EXECUTABLE_PATH) include(GetPrerequisites) get_prerequisites("${EXECUTABLE_PATH}" PREREQUISITES 1 1 "" "") diff --git a/cmake/RunSimulation.cmake b/cmake/RunSimulation.cmake index 11fc1f8d54a..c80a129f885 100644 --- a/cmake/RunSimulation.cmake +++ b/cmake/RunSimulation.cmake @@ -46,20 +46,14 @@ if("${EPMACRO_RESULT}" GREATER -1) endforeach() # find the appropriate executable file if(UNIX AND NOT APPLE) - find_program( - EPMACRO_EXE EPMacro - PATHS "${SOURCE_DIR}/bin/EPMacro/Linux" - NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH NO_CMAKE_FIND_ROOT_PATH) + find_program(EPMACRO_EXE EPMacro PATHS "${SOURCE_DIR}/bin/EPMacro/Linux" NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH + NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH NO_CMAKE_FIND_ROOT_PATH) elseif(APPLE) - find_program( - EPMACRO_EXE EPMacro - PATHS "${SOURCE_DIR}/bin/EPMacro/Mac" - NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH NO_CMAKE_FIND_ROOT_PATH) + find_program(EPMACRO_EXE EPMacro PATHS "${SOURCE_DIR}/bin/EPMacro/Mac" NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH + NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH NO_CMAKE_FIND_ROOT_PATH) else() # windows - find_program( - EPMACRO_EXE EPMacro - PATHS "${SOURCE_DIR}/bin/EPMacro/Windows" - NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH NO_CMAKE_FIND_ROOT_PATH) + find_program(EPMACRO_EXE EPMacro PATHS "${SOURCE_DIR}/bin/EPMacro/Windows" + NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH NO_CMAKE_FIND_ROOT_PATH) endif() # Move EPMacro to executable directory execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different "${EPMACRO_EXE}" "${EXE_PATH}") @@ -72,10 +66,8 @@ if(BUILD_FORTRAN) # Parametric preprocessor next string(FIND "${IDF_CONTENT}" "Parametric:" PAR_RESULT) if("${PAR_RESULT}" GREATER -1) - find_program( - PARAMETRIC_EXE ParametricPreprocessor - PATHS "${PRODUCT_PATH}" - NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH NO_CMAKE_FIND_ROOT_PATH) + find_program(PARAMETRIC_EXE ParametricPreprocessor PATHS "${PRODUCT_PATH}" + NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH NO_CMAKE_FIND_ROOT_PATH) execute_process(COMMAND ${CMAKE_COMMAND} -E copy "${IDF_PATH}" "${OUTPUT_DIR_PATH}") execute_process(COMMAND "${PARAMETRIC_EXE}" "${IDF_FILE}" WORKING_DIRECTORY "${OUTPUT_DIR_PATH}") @@ -100,10 +92,8 @@ if(BUILD_FORTRAN) string(FIND "${IDF_CONTENT}" "GroundHeatTransfer:Basement" BASEMENT_RESULT) if("${SLAB_RESULT}" GREATER -1 OR "${BASEMENT_RESULT}" GREATER -1) - find_program( - EXPANDOBJECTS_EXE ExpandObjects - PATHS "${BINARY_DIR}/Products/" - NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH NO_CMAKE_FIND_ROOT_PATH) + find_program(EXPANDOBJECTS_EXE ExpandObjects PATHS "${BINARY_DIR}/Products/" + NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH NO_CMAKE_FIND_ROOT_PATH) message("Executing ExpandObjects from ${EXPANDOBJECTS_EXE}") execute_process(COMMAND ${CMAKE_COMMAND} -E copy "${IDF_PATH}" "${OUTPUT_DIR_PATH}/in.idf") execute_process(COMMAND ${CMAKE_COMMAND} -E copy "${EPW_PATH}" "${OUTPUT_DIR_PATH}/in.epw") @@ -114,10 +104,8 @@ if(BUILD_FORTRAN) # Copy files needed for Slab file(COPY "${SOURCE_DIR}/idd/SlabGHT.idd" DESTINATION "${OUTPUT_DIR_PATH}") # Find and run slab - find_program( - SLAB_EXE Slab - PATHS "${PRODUCT_PATH}" - NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH NO_CMAKE_FIND_ROOT_PATH) + find_program(SLAB_EXE Slab PATHS "${PRODUCT_PATH}" NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH + NO_CMAKE_SYSTEM_PATH NO_CMAKE_FIND_ROOT_PATH) message("Executing Slab from ${SLAB_EXE}") execute_process(COMMAND "${SLAB_EXE}" WORKING_DIRECTORY "${OUTPUT_DIR_PATH}") # Then copy slab results into the expanded file @@ -129,10 +117,8 @@ if(BUILD_FORTRAN) # Copy files needed for Basement file(COPY "${SOURCE_DIR}/idd/BasementGHT.idd" DESTINATION "${OUTPUT_DIR_PATH}") # Find and run basement - find_program( - BASEMENT_EXE Basement - PATHS "${PRODUCT_PATH}" - NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH NO_CMAKE_FIND_ROOT_PATH) + find_program(BASEMENT_EXE Basement PATHS "${PRODUCT_PATH}" NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH + NO_CMAKE_SYSTEM_PATH NO_CMAKE_FIND_ROOT_PATH) message("Executing Basement from ${BASEMENT_EXE}") execute_process(COMMAND "${BASEMENT_EXE}" WORKING_DIRECTORY "${OUTPUT_DIR_PATH}") # Then copy basement results into the expanded file @@ -147,10 +133,8 @@ if(BUILD_FORTRAN) list(FIND ENERGYPLUS_FLAGS_LIST -x EXPAND_RESULT) if("${EXPAND_RESULT}" GREATER -1) - find_program( - EXPANDOBJECTS_EXE ExpandObjects - PATHS "${PRODUCT_PATH}" - NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH NO_CMAKE_FIND_ROOT_PATH) + find_program(EXPANDOBJECTS_EXE ExpandObjects PATHS "${PRODUCT_PATH}" NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH + NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH NO_CMAKE_FIND_ROOT_PATH) # Move to executable directory execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different "${EXPANDOBJECTS_EXE}" "${EXE_PATH}") endif() @@ -158,10 +142,8 @@ if(BUILD_FORTRAN) list(FIND ENERGYPLUS_FLAGS_LIST -r READVARS_RESULT) if("${READVARS_RESULT}" GREATER -1) - find_program( - READVARS_EXE ReadVarsESO - PATHS "${PRODUCT_PATH}" - NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH NO_CMAKE_FIND_ROOT_PATH) + find_program(READVARS_EXE ReadVarsESO PATHS "${PRODUCT_PATH}" NO_DEFAULT_PATH NO_CMAKE_ENVIRONMENT_PATH NO_CMAKE_PATH NO_SYSTEM_ENVIRONMENT_PATH + NO_CMAKE_SYSTEM_PATH NO_CMAKE_FIND_ROOT_PATH) # Move to executable directory execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different "${READVARS_EXE}" "${EXE_PATH}") endif() diff --git a/cmake/Sanitizers.cmake b/cmake/Sanitizers.cmake index 58808031c16..f455e3cc681 100644 --- a/cmake/Sanitizers.cmake +++ b/cmake/Sanitizers.cmake @@ -36,9 +36,7 @@ function(enable_sanitizers project_name) option(ENABLE_SANITIZER_MEMORY "Enable memory sanitizer" FALSE) if(ENABLE_SANITIZER_MEMORY AND CMAKE_CXX_COMPILER_ID MATCHES ".*Clang") - if("address" IN_LIST SANITIZERS - OR "thread" IN_LIST SANITIZERS - OR "leak" IN_LIST SANITIZERS) + if("address" IN_LIST SANITIZERS OR "thread" IN_LIST SANITIZERS OR "leak" IN_LIST SANITIZERS) message(WARNING "Memory sanitizer does not work with Address, Thread and Leak sanitizer enabled") else() list(APPEND SANITIZERS "memory") @@ -47,10 +45,7 @@ function(enable_sanitizers project_name) endif() if(SANITIZERS) - if(NOT - "${SANITIZERS}" - STREQUAL - "") + if(NOT "${SANITIZERS}" STREQUAL "") target_compile_options(${project_name} INTERFACE -g) diff --git a/cmake/TargetArch.cmake b/cmake/TargetArch.cmake index 1e772a10a09..a41ff327f4c 100644 --- a/cmake/TargetArch.cmake +++ b/cmake/TargetArch.cmake @@ -108,10 +108,8 @@ function(target_architecture output_var) # #error preprocessor directives... but by exploiting the preprocessor in this # way, we can detect the correct target architecture even when cross-compiling, # since the program itself never needs to be run (only the compiler/preprocessor) - try_run( - run_result_unused compile_result_unused "${PROJECT_BINARY_DIR}" "${PROJECT_BINARY_DIR}/arch.c" - COMPILE_OUTPUT_VARIABLE ARCH - CMAKE_FLAGS CMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}) + try_run(run_result_unused compile_result_unused "${PROJECT_BINARY_DIR}" "${PROJECT_BINARY_DIR}/arch.c" COMPILE_OUTPUT_VARIABLE ARCH + CMAKE_FLAGS CMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}) # Parse the architecture name from the compiler output string(REGEX MATCH "cmake_ARCH ([a-zA-Z0-9_]+)" ARCH "${ARCH}") @@ -127,7 +125,5 @@ function(target_architecture output_var) endif() endif() - set(${output_var} - "${ARCH}" - PARENT_SCOPE) + set(${output_var} "${ARCH}" PARENT_SCOPE) endfunction() diff --git a/cmake/Version.cmake b/cmake/Version.cmake index 9a3414e3305..286d4f0c9fb 100644 --- a/cmake/Version.cmake +++ b/cmake/Version.cmake @@ -8,9 +8,7 @@ set(ENERGYPLUS_VERSION "${CMAKE_VERSION_MAJOR}.${CMAKE_VERSION_MINOR}.${CMAKE_VE string(TIMESTAMP CMAKE_YEAR "%Y") -set(CMAKE_VERSION_BUILD - "Unknown" - CACHE STRING "Build number") +set(CMAKE_VERSION_BUILD "Unknown" CACHE STRING "Build number") find_package(Git) if(NOT GIT_FOUND) @@ -29,9 +27,7 @@ if(GIT_FOUND) OUTPUT_VARIABLE GIT_VERSION ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE) if(${RESULT} EQUAL 0 AND NOT "${GIT_VERSION}" EQUAL "${CMAKE_VERSION_BUILD}") - set(CMAKE_VERSION_BUILD - ${GIT_VERSION} - CACHE STRING "Build number" FORCE) # git sha + set(CMAKE_VERSION_BUILD ${GIT_VERSION} CACHE STRING "Build number" FORCE) # git sha endif() get_filename_component(GIT_DIR "${GIT_EXECUTABLE}" PATH) diff --git a/idd/CMakeLists.txt b/idd/CMakeLists.txt index 34bfcae6012..fe9aa41f35d 100644 --- a/idd/CMakeLists.txt +++ b/idd/CMakeLists.txt @@ -14,4 +14,3 @@ install(FILES "V9-1-0-Energy+.idd" DESTINATION "PreProcess/IDFVersionUpdater") install(FILES "V9-2-0-Energy+.idd" DESTINATION "PreProcess/IDFVersionUpdater") install(FILES "V9-3-0-Energy+.idd" DESTINATION "PreProcess/IDFVersionUpdater") install(FILES "V9-4-0-Energy+.idd" DESTINATION "PreProcess/IDFVersionUpdater") - diff --git a/src/AppGPostProcess/CMakeLists.txt b/src/AppGPostProcess/CMakeLists.txt index bdab23eb1fa..ad59ecd5278 100644 --- a/src/AppGPostProcess/CMakeLists.txt +++ b/src/AppGPostProcess/CMakeLists.txt @@ -4,9 +4,9 @@ cmake_minimum_required(VERSION 3.5.1) cmake_policy(SET CMP0012 NEW) # if() recognizes boolean constants -set( CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products" ) -set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products" ) -set( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products" ) +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products") +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products") +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products") set(SRC AppGPostProcess.f90) @@ -35,7 +35,7 @@ elseif(UNIX) set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -ffree-line-length-200") set(STATIC_EXE TRUE) endif() -else() # Windows +else() # Windows set(STATIC_EXE TRUE) if(CMAKE_Fortran_COMPILER MATCHES "ifort") # Set release flags to be empty @@ -52,12 +52,11 @@ else() # Windows endif() set(SKIP_BUILD_RPATH TRUE) -add_executable( AppGPostProcess ${SRC} ) +add_executable(AppGPostProcess ${SRC}) set_target_properties(AppGPostProcess PROPERTIES FOLDER Auxiliary) -install( TARGETS AppGPostProcess DESTINATION PostProcess ) +install(TARGETS AppGPostProcess DESTINATION PostProcess) if(NOT ${STATIC_EXE}) include("${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/ProjectMacros.cmake") - install_target_prereqs( AppGPostProcess PostProcess ) + install_target_prereqs(AppGPostProcess PostProcess) endif() - diff --git a/src/Basement/CMakeLists.txt b/src/Basement/CMakeLists.txt index 79807ced457..c4cd5e540e5 100644 --- a/src/Basement/CMakeLists.txt +++ b/src/Basement/CMakeLists.txt @@ -4,21 +4,20 @@ cmake_minimum_required(VERSION 3.5.1) cmake_policy(SET CMP0012 NEW) # if() recognizes boolean constants -set( CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products" ) -set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products" ) -set( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products" ) +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products") +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products") +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products") set(SRC - 3DBasementHT.f90 - DataGlobals.f90 - DataStringGlobals.f90 - EPWRead.f90 - UtilityRoutines.f90 - DataPrecisionGlobals.f90 - EPWPrecisionGlobals.f90 - InputProcessor.f90 - BasementSimData.f90 -) + 3DBasementHT.f90 + DataGlobals.f90 + DataStringGlobals.f90 + EPWRead.f90 + UtilityRoutines.f90 + DataPrecisionGlobals.f90 + EPWPrecisionGlobals.f90 + InputProcessor.f90 + BasementSimData.f90) set(STATIC_EXE FALSE) @@ -26,23 +25,25 @@ if(APPLE) if(CMAKE_Fortran_COMPILER MATCHES "ifort") set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -static-intel") else() - set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -ffloat-store" ) + set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -ffloat-store") endif() elseif(UNIX) set(CMAKE_SKIP_RPATH TRUE) if(CMAKE_Fortran_COMPILER MATCHES "ifort") set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -static-intel") else() - set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -ffloat-store" ) - set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -static" ) + set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -ffloat-store") + set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -static") set(STATIC_EXE TRUE) endif() -else() # Windows +else() # Windows set(STATIC_EXE TRUE) if(CMAKE_Fortran_COMPILER MATCHES "ifort") # Set release flags to be empty set(CMAKE_Fortran_FLAGS_RELEASE "") - set(CMAKE_Fortran_FLAGS "/nologo /debug:minimal /O2 /Oy- /assume:buffered_io /noaltparam /fpscomp:nolibs /fpe:0 /fp:fast=2 /traceback /check:uninit /libs:static /threads /c /assume:protect-parens /Qprec-div /Qprec-sqrt /Qimf-precision:high /Qimf-arch-consistency:true /Qvec-") + set(CMAKE_Fortran_FLAGS + "/nologo /debug:minimal /O2 /Oy- /assume:buffered_io /noaltparam /fpscomp:nolibs /fpe:0 /fp:fast=2 /traceback /check:uninit /libs:static /threads /c /assume:protect-parens /Qprec-div /Qprec-sqrt /Qimf-precision:high /Qimf-arch-consistency:true /Qvec-" + ) else() set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -static") set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -ffloat-store") @@ -50,17 +51,14 @@ else() # Windows endif() set(SKIP_BUILD_RPATH TRUE) -add_executable( Basement ${SRC} ) +add_executable(Basement ${SRC}) -set_target_properties(Basement PROPERTIES - COMPILE_FLAGS "-O1 -ffree-line-length-200 ${SHARED_FLAGS}" -) +set_target_properties(Basement PROPERTIES COMPILE_FLAGS "-O1 -ffree-line-length-200 ${SHARED_FLAGS}") set_target_properties(Basement PROPERTIES FOLDER Auxiliary) -install( TARGETS Basement DESTINATION PreProcess/GrndTempCalc ) +install(TARGETS Basement DESTINATION PreProcess/GrndTempCalc) if(NOT ${STATIC_EXE}) include("${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/ProjectMacros.cmake") - install_target_prereqs( Basement PreProcess/GrndTempCalc ) + install_target_prereqs(Basement PreProcess/GrndTempCalc) endif() install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../../idd/BasementGHT.idd" DESTINATION "PreProcess/GrndTempCalc/") - diff --git a/src/CalcSoilSurfTemp/CMakeLists.txt b/src/CalcSoilSurfTemp/CMakeLists.txt index 1a0a66b34a6..0a96b843285 100644 --- a/src/CalcSoilSurfTemp/CMakeLists.txt +++ b/src/CalcSoilSurfTemp/CMakeLists.txt @@ -4,9 +4,9 @@ cmake_minimum_required(VERSION 3.5.1) cmake_policy(SET CMP0012 NEW) # if() recognizes boolean constants -set( CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products" ) -set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products" ) -set( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products" ) +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products") +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products") +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products") set(SRC EPWRead.f90 SoilSurfTemp.f90) @@ -35,7 +35,7 @@ elseif(UNIX) set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -ffree-line-length-200") set(STATIC_EXE TRUE) endif() -else() # Windows +else() # Windows set(STATIC_EXE TRUE) if(CMAKE_Fortran_COMPILER MATCHES "ifort") # Set release flags to be empty @@ -52,12 +52,11 @@ else() # Windows endif() set(SKIP_BUILD_RPATH TRUE) -ADD_EXECUTABLE( CalcSoilSurfTemp ${SRC} ) +add_executable(CalcSoilSurfTemp ${SRC}) set_target_properties(CalcSoilSurfTemp PROPERTIES FOLDER Auxiliary) -install( TARGETS CalcSoilSurfTemp DESTINATION PreProcess/CalcSoilSurfTemp ) +install(TARGETS CalcSoilSurfTemp DESTINATION PreProcess/CalcSoilSurfTemp) if(NOT ${STATIC_EXE}) include("${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/ProjectMacros.cmake") - install_target_prereqs( CalcSoilSurfTemp PreProcess/CalcSoilSurfTemp ) + install_target_prereqs(CalcSoilSurfTemp PreProcess/CalcSoilSurfTemp) endif() - diff --git a/src/ConvertInputFormat/CMakeLists.txt b/src/ConvertInputFormat/CMakeLists.txt index 856c360fd46..3782a833bed 100644 --- a/src/ConvertInputFormat/CMakeLists.txt +++ b/src/ConvertInputFormat/CMakeLists.txt @@ -1,23 +1,22 @@ cmake_minimum_required(VERSION 3.5.1) project(ConvertInputFormat) -if (APPLE OR UNIX) - add_executable( ConvertInputFormat main.cpp ) -else() # windows - add_executable( ConvertInputFormat main.cpp ) # "${CMAKE_CURRENT_BINARY_DIR}/energyplus.rc" ) +if(APPLE OR UNIX) + add_executable(ConvertInputFormat main.cpp) +else() # windows + add_executable(ConvertInputFormat main.cpp) # "${CMAKE_CURRENT_BINARY_DIR}/energyplus.rc" ) endif() # Detect OpenMP support in a compiler. If the compiler supports OpenMP, the # flags to compile with OpenMP are returned and added. find_package(OpenMP) -if (OPENMP_FOUND) - target_link_libraries (ConvertInputFormat PRIVATE OpenMP::OpenMP_CXX) -endif (OPENMP_FOUND) - +if(OPENMP_FOUND) + target_link_libraries(ConvertInputFormat PRIVATE OpenMP::OpenMP_CXX) +endif() -target_link_libraries( ConvertInputFormat PRIVATE energyplusparser project_options project_warnings) +target_link_libraries(ConvertInputFormat PRIVATE energyplusparser project_options project_warnings) set_target_properties(ConvertInputFormat PROPERTIES VERSION ${ENERGYPLUS_VERSION}) set_target_properties(ConvertInputFormat PROPERTIES FOLDER Auxiliary) -install( TARGETS ConvertInputFormat DESTINATION ./ ) +install(TARGETS ConvertInputFormat DESTINATION ./) diff --git a/src/EnergyPlus/AirflowNetwork/CMakeLists.txt b/src/EnergyPlus/AirflowNetwork/CMakeLists.txt index a9bb858c84f..e052deef77d 100644 --- a/src/EnergyPlus/AirflowNetwork/CMakeLists.txt +++ b/src/EnergyPlus/AirflowNetwork/CMakeLists.txt @@ -6,7 +6,6 @@ set(HDRS include/AirflowNetwork/Solver.hpp include/AirflowNetwork/Elements.hpp i set(SRCS src/Solver.cpp src/Elements.cpp src/Properties.cpp) - # Create a static library # this will be linked statically to create the DLL and also the unit tests add_library(airflownetworklib STATIC ${SRCS} ${HDRS}) diff --git a/src/EnergyPlus/CMakeLists.txt b/src/EnergyPlus/CMakeLists.txt index 65d3333090a..8d5af02e527 100644 --- a/src/EnergyPlus/CMakeLists.txt +++ b/src/EnergyPlus/CMakeLists.txt @@ -1,17 +1,13 @@ if(WIN32) configure_file(energyplus.rc.in "${CMAKE_CURRENT_BINARY_DIR}/energyplus.rc") - configure_file(energyplusapi.rc.in - "${CMAKE_CURRENT_BINARY_DIR}/energyplusapi.rc") + configure_file(energyplusapi.rc.in "${CMAKE_CURRENT_BINARY_DIR}/energyplusapi.rc") endif() set(PYTHON_API_VERSION_MAJOR 0) set(PYTHON_API_VERSION_MINOR 2) -configure_file(DataStringGlobals.in.cc - "${CMAKE_CURRENT_BINARY_DIR}/DataStringGlobals.cc") -configure_file(ConfiguredFunctions.in.cc - "${CMAKE_CURRENT_BINARY_DIR}/ConfiguredFunctions.cc") -file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/EmbeddedEpJSONSchema.cc" - "Will be filled in later by GenerateEmbeddedEpJSONSchema") +configure_file(DataStringGlobals.in.cc "${CMAKE_CURRENT_BINARY_DIR}/DataStringGlobals.cc") +configure_file(ConfiguredFunctions.in.cc "${CMAKE_CURRENT_BINARY_DIR}/ConfiguredFunctions.cc") +file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/EmbeddedEpJSONSchema.cc" "Will be filled in later by GenerateEmbeddedEpJSONSchema") if(LINK_WITH_PYTHON) add_definitions("-DLINK_WITH_PYTHON=1") @@ -37,667 +33,667 @@ if(USE_PSYCH_ERRORS) add_definitions("-DEP_psych_errors") endif() -SET( SRC - "${PROJECT_SOURCE_DIR}/third_party/milo/dtoa.h" - "${PROJECT_SOURCE_DIR}/third_party/milo/itoa.h" - "${PROJECT_SOURCE_DIR}/third_party/milo/diyfp.h" - "${PROJECT_SOURCE_DIR}/third_party/milo/ieee754.h" - AirLoopHVACDOAS.cc - AirLoopHVACDOAS.hh - AirTerminalUnit.hh - AirflowNetworkBalanceManager.cc - AirflowNetworkBalanceManager.hh - Autosizing/All_Simple_Sizing.cc - Autosizing/All_Simple_Sizing.hh - Autosizing/Base.cc - Autosizing/Base.hh - Autosizing/BaseSizerWithFanHeatInputs.cc - Autosizing/BaseSizerWithFanHeatInputs.hh - Autosizing/BaseSizerWithScalableInputs.cc - Autosizing/BaseSizerWithScalableInputs.hh - Autosizing/CoolingAirFlowSizing.cc - Autosizing/CoolingAirFlowSizing.hh - Autosizing/CoolingCapacitySizing.cc - Autosizing/CoolingCapacitySizing.hh - Autosizing/CoolingSHRSizing.cc - Autosizing/CoolingSHRSizing.hh - Autosizing/CoolingWaterDesAirInletHumRatSizing.cc - Autosizing/CoolingWaterDesAirInletHumRatSizing.hh - Autosizing/CoolingWaterDesAirInletTempSizing.cc - Autosizing/CoolingWaterDesAirInletTempSizing.hh - Autosizing/CoolingWaterDesAirOutletHumRatSizing.cc - Autosizing/CoolingWaterDesAirOutletHumRatSizing.hh - Autosizing/CoolingWaterDesAirOutletTempSizing.cc - Autosizing/CoolingWaterDesAirOutletTempSizing.hh - Autosizing/CoolingWaterDesWaterInletTempSizing.cc - Autosizing/CoolingWaterDesWaterInletTempSizing.hh - Autosizing/CoolingWaterNumofTubesPerRowSizing.cc - Autosizing/CoolingWaterNumofTubesPerRowSizing.hh - Autosizing/CoolingWaterflowSizing.cc - Autosizing/CoolingWaterflowSizing.hh - Autosizing/HeatingAirFlowSizing.cc - Autosizing/HeatingAirFlowSizing.hh - Autosizing/HeatingAirflowUASizing.cc - Autosizing/HeatingAirflowUASizing.hh - Autosizing/HeatingCapacitySizing.cc - Autosizing/HeatingCapacitySizing.hh - Autosizing/HeatingWaterDesAirInletHumRatSizing.cc - Autosizing/HeatingWaterDesAirInletHumRatSizing.hh - Autosizing/HeatingWaterDesAirInletTempSizing.cc - Autosizing/HeatingWaterDesAirInletTempSizing.hh - Autosizing/HeatingWaterDesCoilLoadUsedForUASizing.cc - Autosizing/HeatingWaterDesCoilLoadUsedForUASizing.hh - Autosizing/HeatingWaterDesCoilWaterVolFlowUsedForUASizing.cc - Autosizing/HeatingWaterDesCoilWaterVolFlowUsedForUASizing.hh - Autosizing/HeatingWaterflowSizing.cc - Autosizing/HeatingWaterflowSizing.hh - Autosizing/SystemAirFlowSizing.cc - Autosizing/SystemAirFlowSizing.hh - Autosizing/WaterHeatingCapacitySizing.cc - Autosizing/WaterHeatingCapacitySizing.hh - Autosizing/WaterHeatingCoilUASizing.cc - Autosizing/WaterHeatingCoilUASizing.hh - BaseboardElectric.cc - BaseboardElectric.hh - BaseboardRadiator.cc - BaseboardRadiator.hh - BoilerSteam.cc - BoilerSteam.hh - Boilers.cc - Boilers.hh - BranchInputManager.cc - BranchInputManager.hh - BranchNodeConnections.cc - BranchNodeConnections.hh - CTElectricGenerator.cc - CTElectricGenerator.hh - ChilledCeilingPanelSimple.cc - ChilledCeilingPanelSimple.hh - ChillerAbsorption.cc - ChillerAbsorption.hh - ChillerElectricEIR.cc - ChillerElectricEIR.hh - ChillerExhaustAbsorption.cc - ChillerExhaustAbsorption.hh - ChillerGasAbsorption.cc - ChillerGasAbsorption.hh - ChillerIndirectAbsorption.cc - ChillerIndirectAbsorption.hh - ChillerReformulatedEIR.cc - ChillerReformulatedEIR.hh - Coils/CoilCoolingDX.cc - Coils/CoilCoolingDX.hh - Coils/CoilCoolingDXCurveFitOperatingMode.cc - Coils/CoilCoolingDXCurveFitOperatingMode.hh - Coils/CoilCoolingDXCurveFitPerformance.cc - Coils/CoilCoolingDXCurveFitPerformance.hh - Coils/CoilCoolingDXCurveFitSpeed.cc - Coils/CoilCoolingDXCurveFitSpeed.hh - CondenserLoopTowers.cc - CondenserLoopTowers.hh - ConfiguredFunctions.hh - "${CMAKE_CURRENT_BINARY_DIR}/ConfiguredFunctions.cc" - Construction.cc - Construction.hh - ConvectionCoefficients.cc - ConvectionCoefficients.hh - CoolTower.cc - CoolTower.hh - CostEstimateManager.cc - CostEstimateManager.hh - CrossVentMgr.cc - CrossVentMgr.hh - CurveManager.cc - CurveManager.hh - DElightManagerF.cc - DElightManagerF.hh - DXCoils.cc - DXCoils.hh - DXFEarClipping.cc - DXFEarClipping.hh - Data/BaseData.hh - Data/CommonIncludes.hh - Data/EnergyPlusData.cc - Data/EnergyPlusData.hh - DataAirLoop.hh - DataAirSystems.cc - DataAirSystems.hh - DataBSDFWindow.hh - DataBranchAirLoopPlant.hh - DataBranchNodeConnections.hh - DataComplexFenestration.hh - DataContaminantBalance.hh - DataConvergParams.hh - DataConversions.hh - DataDElight.hh - DataDaylighting.hh - DataDaylightingDevices.hh - DataDefineEquip.hh - DataEnvironment.cc - DataEnvironment.hh - DataErrorTracking.cc - DataErrorTracking.hh - DataGenerators.hh - DataGlobalConstants.cc - DataGlobalConstants.hh - DataGlobals.hh - DataHVACControllers.cc - DataHVACControllers.hh - DataHVACGlobals.cc - DataHVACGlobals.hh - DataHVACSystems.hh - DataHeatBalFanSys.cc - DataHeatBalFanSys.hh - DataHeatBalSurface.cc - DataHeatBalSurface.hh - DataHeatBalance.cc - DataHeatBalance.hh - DataIPShortCuts.cc - DataIPShortCuts.hh - DataLoopNode.cc - DataLoopNode.hh - DataMoistureBalance.cc - DataMoistureBalance.hh - DataMoistureBalanceEMPD.cc - DataMoistureBalanceEMPD.hh - DataOutputs.cc - DataOutputs.hh - DataPhotovoltaics.cc - DataPhotovoltaics.hh - DataPrecisionGlobals.cc - DataPrecisionGlobals.hh - DataReportingFlags.cc - DataReportingFlags.hh - DataRoomAirModel.cc - DataRoomAirModel.hh - DataRootFinder.cc - DataRootFinder.hh - DataRuntimeLanguage.cc - DataRuntimeLanguage.hh - DataShadowingCombinations.cc - DataShadowingCombinations.hh - DataSizing.cc - DataSizing.hh - "${CMAKE_CURRENT_BINARY_DIR}/DataStringGlobals.cc" - DataStringGlobals.hh - DataSurfaceColors.cc - DataSurfaceColors.hh - DataSurfaceLists.cc - DataSurfaceLists.hh - DataSurfaces.cc - DataSurfaces.hh - DataSystemVariables.cc - DataSystemVariables.hh - DataTimings.cc - DataTimings.hh - DataUCSDSharedData.cc - DataUCSDSharedData.hh - DataVectorTypes.hh - DataViewFactorInformation.cc - DataViewFactorInformation.hh - DataWater.hh - DataWindowEquivalentLayer.cc - DataWindowEquivalentLayer.hh - DataZoneControls.hh - DataZoneEnergyDemands.hh - DataZoneEquipment.cc - DataZoneEquipment.hh - DaylightingDevices.cc - DaylightingDevices.hh - DaylightingManager.cc - DaylightingManager.hh - DemandManager.cc - DemandManager.hh - DesiccantDehumidifiers.cc - DesiccantDehumidifiers.hh - DisplacementVentMgr.cc - DisplacementVentMgr.hh - DisplayRoutines.cc - DisplayRoutines.hh - DualDuct.cc - DualDuct.hh - EMSManager.cc - EMSManager.hh - EarthTube.cc - EarthTube.hh - EcoRoofManager.cc - EcoRoofManager.hh - EconomicLifeCycleCost.cc - EconomicLifeCycleCost.hh - EconomicTariff.cc - EconomicTariff.hh - ElectricBaseboardRadiator.cc - ElectricBaseboardRadiator.hh - ElectricPowerServiceManager.cc - ElectricPowerServiceManager.hh - EnergyPlus.hh - EvaporativeCoolers.cc - EvaporativeCoolers.hh - EvaporativeFluidCoolers.cc - EvaporativeFluidCoolers.hh - ExteriorEnergyUse.cc - ExteriorEnergyUse.hh - ExternalInterface.cc - ExternalInterface.hh - FanCoilUnits.cc - FanCoilUnits.hh - Fans.cc - Fans.hh - FaultsManager.cc - FaultsManager.hh - FileSystem.cc - FileSystem.hh - FluidCoolers.cc - FluidCoolers.hh - FluidProperties.cc - FluidProperties.hh - FuelCellElectricGenerator.cc - FuelCellElectricGenerator.hh - Furnaces.cc - Furnaces.hh - General.cc - General.hh - GeneralRoutines.cc - GeneralRoutines.hh - GeneratorDynamicsManager.cc - GeneratorDynamicsManager.hh - GeneratorFuelSupply.cc - GeneratorFuelSupply.hh - GlobalNames.cc - GlobalNames.hh - GroundHeatExchangers.cc - GroundHeatExchangers.hh - GroundTemperatureModeling/BaseGroundTemperatureModel.hh - GroundTemperatureModeling/FiniteDifferenceGroundTemperatureModel.cc - GroundTemperatureModeling/FiniteDifferenceGroundTemperatureModel.hh - GroundTemperatureModeling/GroundTemperatureModelManager.cc - GroundTemperatureModeling/GroundTemperatureModelManager.hh - GroundTemperatureModeling/KusudaAchenbachGroundTemperatureModel.cc - GroundTemperatureModeling/KusudaAchenbachGroundTemperatureModel.hh - GroundTemperatureModeling/SiteBuildingSurfaceGroundTemperatures.cc - GroundTemperatureModeling/SiteBuildingSurfaceGroundTemperatures.hh - GroundTemperatureModeling/SiteDeepGroundTemperatures.cc - GroundTemperatureModeling/SiteDeepGroundTemperatures.hh - GroundTemperatureModeling/SiteFCFactorMethodGroundTemperatures.cc - GroundTemperatureModeling/SiteFCFactorMethodGroundTemperatures.hh - GroundTemperatureModeling/SiteShallowGroundTemperatures.cc - GroundTemperatureModeling/SiteShallowGroundTemperatures.hh - GroundTemperatureModeling/XingGroundTemperatureModel.cc - GroundTemperatureModeling/XingGroundTemperatureModel.hh - HVACControllers.cc - HVACControllers.hh - HVACCooledBeam.cc - HVACCooledBeam.hh - HVACDXHeatPumpSystem.cc - HVACDXHeatPumpSystem.hh - HVACDXSystem.cc - HVACDXSystem.hh - HVACDuct.cc - HVACDuct.hh - HVACFan.cc - HVACFan.hh - HVACFourPipeBeam.cc - HVACFourPipeBeam.hh - HVACHXAssistedCoolingCoil.cc - HVACHXAssistedCoolingCoil.hh - HVACInterfaceManager.cc - HVACInterfaceManager.hh - HVACManager.cc - HVACManager.hh - HVACMultiSpeedHeatPump.cc - HVACMultiSpeedHeatPump.hh - HVACSingleDuctInduc.cc - HVACSingleDuctInduc.hh - HVACSizingSimulationManager.cc - HVACSizingSimulationManager.hh - HVACStandAloneERV.cc - HVACStandAloneERV.hh - HVACUnitaryBypassVAV.cc - HVACUnitaryBypassVAV.hh - HVACVariableRefrigerantFlow.cc - HVACVariableRefrigerantFlow.hh - HWBaseboardRadiator.cc - HWBaseboardRadiator.hh - HeatBalFiniteDiffManager.cc - HeatBalFiniteDiffManager.hh - HeatBalanceAirManager.cc - HeatBalanceAirManager.hh - HeatBalanceHAMTManager.cc - HeatBalanceHAMTManager.hh - HeatBalanceIntRadExchange.cc - HeatBalanceIntRadExchange.hh - HeatBalanceInternalHeatGains.cc - HeatBalanceInternalHeatGains.hh - HeatBalanceKivaManager.cc - HeatBalanceKivaManager.hh - HeatBalanceManager.cc - HeatBalanceManager.hh - HeatBalanceMovableInsulation.cc - HeatBalanceMovableInsulation.hh - HeatBalanceSurfaceManager.cc - HeatBalanceSurfaceManager.hh - HeatPumpWaterToWaterCOOLING.cc - HeatPumpWaterToWaterCOOLING.hh - HeatPumpWaterToWaterHEATING.cc - HeatPumpWaterToWaterHEATING.hh - HeatPumpWaterToWaterSimple.cc - HeatPumpWaterToWaterSimple.hh - HeatRecovery.cc - HeatRecovery.hh - HeatingCoils.cc - HeatingCoils.hh - HighTempRadiantSystem.cc - HighTempRadiantSystem.hh - Humidifiers.cc - Humidifiers.hh - HybridEvapCoolingModel.cc - HybridEvapCoolingModel.hh - HybridModel.cc - HybridModel.hh - HybridUnitaryAirConditioners.cc - HybridUnitaryAirConditioners.hh - ICEngineElectricGenerator.cc - ICEngineElectricGenerator.hh - IceThermalStorage.cc - IceThermalStorage.hh - InputProcessing/DataStorage.hh - InputProcessing/EmbeddedEpJSONSchema.hh - "${CMAKE_CURRENT_BINARY_DIR}/EmbeddedEpJSONSchema.cc" - IOFiles.cc - IOFiles.hh - InputProcessing/IdfParser.cc - InputProcessing/IdfParser.hh - InputProcessing/InputProcessor.cc - InputProcessing/InputProcessor.hh - InputProcessing/InputValidation.cc - InputProcessing/InputValidation.hh - IntegratedHeatPump.cc - IntegratedHeatPump.hh - InternalHeatGains.cc - InternalHeatGains.hh - LowTempRadiantSystem.cc - LowTempRadiantSystem.hh - Material.hh - MatrixDataManager.cc - MatrixDataManager.hh - MicroCHPElectricGenerator.cc - MicroCHPElectricGenerator.hh - MicroturbineElectricGenerator.cc - MicroturbineElectricGenerator.hh - MixedAir.cc - MixedAir.hh - MixerComponent.cc - MixerComponent.hh - MoistureBalanceEMPDManager.cc - MoistureBalanceEMPDManager.hh - MundtSimMgr.cc - MundtSimMgr.hh - NodeInputManager.cc - NodeInputManager.hh - NonZoneEquipmentManager.cc - NonZoneEquipmentManager.hh - OutAirNodeManager.cc - OutAirNodeManager.hh - OutdoorAirUnit.cc - OutdoorAirUnit.hh - OutputProcessor.cc - OutputProcessor.hh - OutputReportData.cc - OutputReportData.hh - OutputReportPredefined.cc - OutputReportPredefined.hh - OutputReportTabular.cc - OutputReportTabular.hh - OutputReportTabularAnnual.cc - OutputReportTabularAnnual.hh - OutputReports.cc - OutputReports.hh - OutsideEnergySources.cc - OutsideEnergySources.hh - PVWatts.cc - PVWatts.hh - PackagedTerminalHeatPump.cc - PackagedTerminalHeatPump.hh - PackagedThermalStorageCoil.cc - PackagedThermalStorageCoil.hh - PhaseChangeModeling/HysteresisModel.cc - PhaseChangeModeling/HysteresisModel.hh - PhotovoltaicThermalCollectors.cc - PhotovoltaicThermalCollectors.hh - Photovoltaics.cc - Photovoltaics.hh - PierceSurface.hh - PipeHeatTransfer.cc - PipeHeatTransfer.hh - Pipes.cc - Pipes.hh - Plant/Branch.cc - Plant/Branch.hh - Plant/CallingOrder.hh - Plant/Component.cc - Plant/Component.hh - Plant/ConnectedLoopData.hh - Plant/Connection.hh - Plant/DataPlant.cc - Plant/DataPlant.hh - Plant/Enums.hh - Plant/EquipAndOperations.hh - Plant/Loop.cc - Plant/Loop.hh - Plant/LoopSide.cc - Plant/LoopSide.hh - Plant/LoopSidePumpInformation.hh - Plant/MeterData.hh - Plant/MixerData.hh - Plant/PlantAvailManager.hh - Plant/PlantConvergencePoint.hh - Plant/PlantLocation.hh - Plant/PlantManager.cc - Plant/PlantManager.hh - Plant/ReportBranchData.hh - Plant/ReportCompData.hh - Plant/ReportLoopData.hh - Plant/SplitterData.hh - Plant/Subcomponents.hh - PlantCentralGSHP.cc - PlantCentralGSHP.hh - PlantChillers.cc - PlantChillers.hh - PlantComponent.hh - PlantComponentTemperatureSources.cc - PlantComponentTemperatureSources.hh - PlantCondLoopOperation.cc - PlantCondLoopOperation.hh - PlantHeatExchangerFluidToFluid.cc - PlantHeatExchangerFluidToFluid.hh - PlantLoadProfile.cc - PlantLoadProfile.hh - PlantLoopHeatPumpEIR.cc - PlantLoopHeatPumpEIR.hh - PlantPipingSystemsManager.cc - PlantPipingSystemsManager.hh - PlantPressureSystem.cc - PlantPressureSystem.hh - PlantUtilities.cc - PlantUtilities.hh - PlantValves.cc - PlantValves.hh - Platform.hh - PluginManager.cc - PluginManager.hh - PollutionModule.cc - PollutionModule.hh - PondGroundHeatExchanger.cc - PondGroundHeatExchanger.hh - PoweredInductionUnits.cc - PoweredInductionUnits.hh - Psychrometrics.cc - Psychrometrics.hh - Pumps.cc - Pumps.hh - PurchasedAirManager.cc - PurchasedAirManager.hh - RefrigeratedCase.cc - RefrigeratedCase.hh - ReportCoilSelection.cc - ReportCoilSelection.hh - ResultsFramework.cc - ResultsFramework.hh - ReturnAirPathManager.cc - ReturnAirPathManager.hh - RoomAirModelAirflowNetwork.cc - RoomAirModelAirflowNetwork.hh - RoomAirModelManager.cc - RoomAirModelManager.hh - RoomAirModelUserTempPattern.cc - RoomAirModelUserTempPattern.hh - RootFinder.cc - RootFinder.hh - RuntimeLanguageProcessor.cc - RuntimeLanguageProcessor.hh - SQLiteProcedures.cc - SQLiteProcedures.hh - SZVAVModel.cc - SZVAVModel.hh - ScheduleManager.cc - ScheduleManager.hh - SetPointManager.cc - SetPointManager.hh - Shape.hh - SimAirServingZones.cc - SimAirServingZones.hh - SimulationManager.cc - SimulationManager.hh - SingleDuct.cc - SingleDuct.hh - SizingAnalysisObjects.cc - SizingAnalysisObjects.hh - SizingManager.cc - SizingManager.hh - SolarCollectors.cc - SolarCollectors.hh - SolarReflectionManager.cc - SolarReflectionManager.hh - SolarShading.cc - SolarShading.hh - SortAndStringUtilities.cc - SortAndStringUtilities.hh - SplitterComponent.cc - SplitterComponent.hh - StandardRatings.cc - StandardRatings.hh - StateManagement.cc - StateManagement.hh - SteamBaseboardRadiator.cc - SteamBaseboardRadiator.hh - SteamCoils.cc - SteamCoils.hh - StringUtilities.hh - SurfaceGeometry.cc - SurfaceGeometry.hh - SurfaceGroundHeatExchanger.cc - SurfaceGroundHeatExchanger.hh - SurfaceOctree.cc - SurfaceOctree.hh - SwimmingPool.cc - SwimmingPool.hh - SystemAvailabilityManager.cc - SystemAvailabilityManager.hh - SystemReports.cc - SystemReports.hh - TARCOGArgs.cc - TARCOGArgs.hh - TARCOGCommon.cc - TARCOGCommon.hh - TARCOGDeflection.cc - TARCOGDeflection.hh - TARCOGGasses90.cc - TARCOGGasses90.hh - TARCOGGassesParams.hh - TARCOGMain.cc - TARCOGMain.hh - TARCOGOutput.cc - TARCOGOutput.hh - TARCOGParams.cc - TARCOGParams.hh - TarcogShading.cc - TarcogShading.hh - TempSolveRoot.cc - TempSolveRoot.hh - ThermalChimney.cc - ThermalChimney.hh - ThermalComfort.cc - ThermalComfort.hh - ThermalEN673Calc.cc - ThermalEN673Calc.hh - ThermalISO15099Calc.cc - ThermalISO15099Calc.hh - Timer.h - TranspiredCollector.cc - TranspiredCollector.hh - UFADManager.cc - UFADManager.hh - UnitHeater.cc - UnitHeater.hh - UnitVentilator.cc - UnitVentilator.hh - UnitarySystem.cc - UnitarySystem.hh - UserDefinedComponents.cc - UserDefinedComponents.hh - UtilityRoutines.cc - UtilityRoutines.hh - VariableSpeedCoils.cc - VariableSpeedCoils.hh - Vectors.cc - Vectors.hh - VentilatedSlab.cc - VentilatedSlab.hh - WaterCoils.cc - WaterCoils.hh - WaterManager.cc - WaterManager.hh - WaterThermalTanks.cc - WaterThermalTanks.hh - WaterToAirHeatPump.cc - WaterToAirHeatPump.hh - WaterToAirHeatPumpSimple.cc - WaterToAirHeatPumpSimple.hh - WaterToWaterHeatPumps.hh - WaterUse.cc - WaterUse.hh - WeatherManager.cc - WeatherManager.hh - WindTurbine.cc - WindTurbine.hh - WindowAC.cc - WindowAC.hh - WindowComplexManager.cc - WindowComplexManager.hh - WindowEquivalentLayer.cc - WindowEquivalentLayer.hh - WindowManager.cc - WindowManager.hh - WindowManagerExteriorData.cc - WindowManagerExteriorData.hh - WindowManagerExteriorOptical.cc - WindowManagerExteriorOptical.hh - WindowManagerExteriorThermal.cc - WindowManagerExteriorThermal.hh - WindowModel.cc - WindowModel.hh - ZoneAirLoopEquipmentManager.cc - ZoneAirLoopEquipmentManager.hh - ZoneContaminantPredictorCorrector.cc - ZoneContaminantPredictorCorrector.hh - ZoneDehumidifier.cc - ZoneDehumidifier.hh - ZoneEquipmentManager.cc - ZoneEquipmentManager.hh - ZonePlenum.cc - ZonePlenum.hh - ZoneTempPredictorCorrector.cc - ZoneTempPredictorCorrector.hh) +set(SRC + "${PROJECT_SOURCE_DIR}/third_party/milo/dtoa.h" + "${PROJECT_SOURCE_DIR}/third_party/milo/itoa.h" + "${PROJECT_SOURCE_DIR}/third_party/milo/diyfp.h" + "${PROJECT_SOURCE_DIR}/third_party/milo/ieee754.h" + AirLoopHVACDOAS.cc + AirLoopHVACDOAS.hh + AirTerminalUnit.hh + AirflowNetworkBalanceManager.cc + AirflowNetworkBalanceManager.hh + Autosizing/All_Simple_Sizing.cc + Autosizing/All_Simple_Sizing.hh + Autosizing/Base.cc + Autosizing/Base.hh + Autosizing/BaseSizerWithFanHeatInputs.cc + Autosizing/BaseSizerWithFanHeatInputs.hh + Autosizing/BaseSizerWithScalableInputs.cc + Autosizing/BaseSizerWithScalableInputs.hh + Autosizing/CoolingAirFlowSizing.cc + Autosizing/CoolingAirFlowSizing.hh + Autosizing/CoolingCapacitySizing.cc + Autosizing/CoolingCapacitySizing.hh + Autosizing/CoolingSHRSizing.cc + Autosizing/CoolingSHRSizing.hh + Autosizing/CoolingWaterDesAirInletHumRatSizing.cc + Autosizing/CoolingWaterDesAirInletHumRatSizing.hh + Autosizing/CoolingWaterDesAirInletTempSizing.cc + Autosizing/CoolingWaterDesAirInletTempSizing.hh + Autosizing/CoolingWaterDesAirOutletHumRatSizing.cc + Autosizing/CoolingWaterDesAirOutletHumRatSizing.hh + Autosizing/CoolingWaterDesAirOutletTempSizing.cc + Autosizing/CoolingWaterDesAirOutletTempSizing.hh + Autosizing/CoolingWaterDesWaterInletTempSizing.cc + Autosizing/CoolingWaterDesWaterInletTempSizing.hh + Autosizing/CoolingWaterNumofTubesPerRowSizing.cc + Autosizing/CoolingWaterNumofTubesPerRowSizing.hh + Autosizing/CoolingWaterflowSizing.cc + Autosizing/CoolingWaterflowSizing.hh + Autosizing/HeatingAirFlowSizing.cc + Autosizing/HeatingAirFlowSizing.hh + Autosizing/HeatingAirflowUASizing.cc + Autosizing/HeatingAirflowUASizing.hh + Autosizing/HeatingCapacitySizing.cc + Autosizing/HeatingCapacitySizing.hh + Autosizing/HeatingWaterDesAirInletHumRatSizing.cc + Autosizing/HeatingWaterDesAirInletHumRatSizing.hh + Autosizing/HeatingWaterDesAirInletTempSizing.cc + Autosizing/HeatingWaterDesAirInletTempSizing.hh + Autosizing/HeatingWaterDesCoilLoadUsedForUASizing.cc + Autosizing/HeatingWaterDesCoilLoadUsedForUASizing.hh + Autosizing/HeatingWaterDesCoilWaterVolFlowUsedForUASizing.cc + Autosizing/HeatingWaterDesCoilWaterVolFlowUsedForUASizing.hh + Autosizing/HeatingWaterflowSizing.cc + Autosizing/HeatingWaterflowSizing.hh + Autosizing/SystemAirFlowSizing.cc + Autosizing/SystemAirFlowSizing.hh + Autosizing/WaterHeatingCapacitySizing.cc + Autosizing/WaterHeatingCapacitySizing.hh + Autosizing/WaterHeatingCoilUASizing.cc + Autosizing/WaterHeatingCoilUASizing.hh + BaseboardElectric.cc + BaseboardElectric.hh + BaseboardRadiator.cc + BaseboardRadiator.hh + BoilerSteam.cc + BoilerSteam.hh + Boilers.cc + Boilers.hh + BranchInputManager.cc + BranchInputManager.hh + BranchNodeConnections.cc + BranchNodeConnections.hh + CTElectricGenerator.cc + CTElectricGenerator.hh + ChilledCeilingPanelSimple.cc + ChilledCeilingPanelSimple.hh + ChillerAbsorption.cc + ChillerAbsorption.hh + ChillerElectricEIR.cc + ChillerElectricEIR.hh + ChillerExhaustAbsorption.cc + ChillerExhaustAbsorption.hh + ChillerGasAbsorption.cc + ChillerGasAbsorption.hh + ChillerIndirectAbsorption.cc + ChillerIndirectAbsorption.hh + ChillerReformulatedEIR.cc + ChillerReformulatedEIR.hh + Coils/CoilCoolingDX.cc + Coils/CoilCoolingDX.hh + Coils/CoilCoolingDXCurveFitOperatingMode.cc + Coils/CoilCoolingDXCurveFitOperatingMode.hh + Coils/CoilCoolingDXCurveFitPerformance.cc + Coils/CoilCoolingDXCurveFitPerformance.hh + Coils/CoilCoolingDXCurveFitSpeed.cc + Coils/CoilCoolingDXCurveFitSpeed.hh + CondenserLoopTowers.cc + CondenserLoopTowers.hh + ConfiguredFunctions.hh + "${CMAKE_CURRENT_BINARY_DIR}/ConfiguredFunctions.cc" + Construction.cc + Construction.hh + ConvectionCoefficients.cc + ConvectionCoefficients.hh + CoolTower.cc + CoolTower.hh + CostEstimateManager.cc + CostEstimateManager.hh + CrossVentMgr.cc + CrossVentMgr.hh + CurveManager.cc + CurveManager.hh + DElightManagerF.cc + DElightManagerF.hh + DXCoils.cc + DXCoils.hh + DXFEarClipping.cc + DXFEarClipping.hh + Data/BaseData.hh + Data/CommonIncludes.hh + Data/EnergyPlusData.cc + Data/EnergyPlusData.hh + DataAirLoop.hh + DataAirSystems.cc + DataAirSystems.hh + DataBSDFWindow.hh + DataBranchAirLoopPlant.hh + DataBranchNodeConnections.hh + DataComplexFenestration.hh + DataContaminantBalance.hh + DataConvergParams.hh + DataConversions.hh + DataDElight.hh + DataDaylighting.hh + DataDaylightingDevices.hh + DataDefineEquip.hh + DataEnvironment.cc + DataEnvironment.hh + DataErrorTracking.cc + DataErrorTracking.hh + DataGenerators.hh + DataGlobalConstants.cc + DataGlobalConstants.hh + DataGlobals.hh + DataHVACControllers.cc + DataHVACControllers.hh + DataHVACGlobals.cc + DataHVACGlobals.hh + DataHVACSystems.hh + DataHeatBalFanSys.cc + DataHeatBalFanSys.hh + DataHeatBalSurface.cc + DataHeatBalSurface.hh + DataHeatBalance.cc + DataHeatBalance.hh + DataIPShortCuts.cc + DataIPShortCuts.hh + DataLoopNode.cc + DataLoopNode.hh + DataMoistureBalance.cc + DataMoistureBalance.hh + DataMoistureBalanceEMPD.cc + DataMoistureBalanceEMPD.hh + DataOutputs.cc + DataOutputs.hh + DataPhotovoltaics.cc + DataPhotovoltaics.hh + DataPrecisionGlobals.cc + DataPrecisionGlobals.hh + DataReportingFlags.cc + DataReportingFlags.hh + DataRoomAirModel.cc + DataRoomAirModel.hh + DataRootFinder.cc + DataRootFinder.hh + DataRuntimeLanguage.cc + DataRuntimeLanguage.hh + DataShadowingCombinations.cc + DataShadowingCombinations.hh + DataSizing.cc + DataSizing.hh + "${CMAKE_CURRENT_BINARY_DIR}/DataStringGlobals.cc" + DataStringGlobals.hh + DataSurfaceColors.cc + DataSurfaceColors.hh + DataSurfaceLists.cc + DataSurfaceLists.hh + DataSurfaces.cc + DataSurfaces.hh + DataSystemVariables.cc + DataSystemVariables.hh + DataTimings.cc + DataTimings.hh + DataUCSDSharedData.cc + DataUCSDSharedData.hh + DataVectorTypes.hh + DataViewFactorInformation.cc + DataViewFactorInformation.hh + DataWater.hh + DataWindowEquivalentLayer.cc + DataWindowEquivalentLayer.hh + DataZoneControls.hh + DataZoneEnergyDemands.hh + DataZoneEquipment.cc + DataZoneEquipment.hh + DaylightingDevices.cc + DaylightingDevices.hh + DaylightingManager.cc + DaylightingManager.hh + DemandManager.cc + DemandManager.hh + DesiccantDehumidifiers.cc + DesiccantDehumidifiers.hh + DisplacementVentMgr.cc + DisplacementVentMgr.hh + DisplayRoutines.cc + DisplayRoutines.hh + DualDuct.cc + DualDuct.hh + EMSManager.cc + EMSManager.hh + EarthTube.cc + EarthTube.hh + EcoRoofManager.cc + EcoRoofManager.hh + EconomicLifeCycleCost.cc + EconomicLifeCycleCost.hh + EconomicTariff.cc + EconomicTariff.hh + ElectricBaseboardRadiator.cc + ElectricBaseboardRadiator.hh + ElectricPowerServiceManager.cc + ElectricPowerServiceManager.hh + EnergyPlus.hh + EvaporativeCoolers.cc + EvaporativeCoolers.hh + EvaporativeFluidCoolers.cc + EvaporativeFluidCoolers.hh + ExteriorEnergyUse.cc + ExteriorEnergyUse.hh + ExternalInterface.cc + ExternalInterface.hh + FanCoilUnits.cc + FanCoilUnits.hh + Fans.cc + Fans.hh + FaultsManager.cc + FaultsManager.hh + FileSystem.cc + FileSystem.hh + FluidCoolers.cc + FluidCoolers.hh + FluidProperties.cc + FluidProperties.hh + FuelCellElectricGenerator.cc + FuelCellElectricGenerator.hh + Furnaces.cc + Furnaces.hh + General.cc + General.hh + GeneralRoutines.cc + GeneralRoutines.hh + GeneratorDynamicsManager.cc + GeneratorDynamicsManager.hh + GeneratorFuelSupply.cc + GeneratorFuelSupply.hh + GlobalNames.cc + GlobalNames.hh + GroundHeatExchangers.cc + GroundHeatExchangers.hh + GroundTemperatureModeling/BaseGroundTemperatureModel.hh + GroundTemperatureModeling/FiniteDifferenceGroundTemperatureModel.cc + GroundTemperatureModeling/FiniteDifferenceGroundTemperatureModel.hh + GroundTemperatureModeling/GroundTemperatureModelManager.cc + GroundTemperatureModeling/GroundTemperatureModelManager.hh + GroundTemperatureModeling/KusudaAchenbachGroundTemperatureModel.cc + GroundTemperatureModeling/KusudaAchenbachGroundTemperatureModel.hh + GroundTemperatureModeling/SiteBuildingSurfaceGroundTemperatures.cc + GroundTemperatureModeling/SiteBuildingSurfaceGroundTemperatures.hh + GroundTemperatureModeling/SiteDeepGroundTemperatures.cc + GroundTemperatureModeling/SiteDeepGroundTemperatures.hh + GroundTemperatureModeling/SiteFCFactorMethodGroundTemperatures.cc + GroundTemperatureModeling/SiteFCFactorMethodGroundTemperatures.hh + GroundTemperatureModeling/SiteShallowGroundTemperatures.cc + GroundTemperatureModeling/SiteShallowGroundTemperatures.hh + GroundTemperatureModeling/XingGroundTemperatureModel.cc + GroundTemperatureModeling/XingGroundTemperatureModel.hh + HVACControllers.cc + HVACControllers.hh + HVACCooledBeam.cc + HVACCooledBeam.hh + HVACDXHeatPumpSystem.cc + HVACDXHeatPumpSystem.hh + HVACDXSystem.cc + HVACDXSystem.hh + HVACDuct.cc + HVACDuct.hh + HVACFan.cc + HVACFan.hh + HVACFourPipeBeam.cc + HVACFourPipeBeam.hh + HVACHXAssistedCoolingCoil.cc + HVACHXAssistedCoolingCoil.hh + HVACInterfaceManager.cc + HVACInterfaceManager.hh + HVACManager.cc + HVACManager.hh + HVACMultiSpeedHeatPump.cc + HVACMultiSpeedHeatPump.hh + HVACSingleDuctInduc.cc + HVACSingleDuctInduc.hh + HVACSizingSimulationManager.cc + HVACSizingSimulationManager.hh + HVACStandAloneERV.cc + HVACStandAloneERV.hh + HVACUnitaryBypassVAV.cc + HVACUnitaryBypassVAV.hh + HVACVariableRefrigerantFlow.cc + HVACVariableRefrigerantFlow.hh + HWBaseboardRadiator.cc + HWBaseboardRadiator.hh + HeatBalFiniteDiffManager.cc + HeatBalFiniteDiffManager.hh + HeatBalanceAirManager.cc + HeatBalanceAirManager.hh + HeatBalanceHAMTManager.cc + HeatBalanceHAMTManager.hh + HeatBalanceIntRadExchange.cc + HeatBalanceIntRadExchange.hh + HeatBalanceInternalHeatGains.cc + HeatBalanceInternalHeatGains.hh + HeatBalanceKivaManager.cc + HeatBalanceKivaManager.hh + HeatBalanceManager.cc + HeatBalanceManager.hh + HeatBalanceMovableInsulation.cc + HeatBalanceMovableInsulation.hh + HeatBalanceSurfaceManager.cc + HeatBalanceSurfaceManager.hh + HeatPumpWaterToWaterCOOLING.cc + HeatPumpWaterToWaterCOOLING.hh + HeatPumpWaterToWaterHEATING.cc + HeatPumpWaterToWaterHEATING.hh + HeatPumpWaterToWaterSimple.cc + HeatPumpWaterToWaterSimple.hh + HeatRecovery.cc + HeatRecovery.hh + HeatingCoils.cc + HeatingCoils.hh + HighTempRadiantSystem.cc + HighTempRadiantSystem.hh + Humidifiers.cc + Humidifiers.hh + HybridEvapCoolingModel.cc + HybridEvapCoolingModel.hh + HybridModel.cc + HybridModel.hh + HybridUnitaryAirConditioners.cc + HybridUnitaryAirConditioners.hh + ICEngineElectricGenerator.cc + ICEngineElectricGenerator.hh + IceThermalStorage.cc + IceThermalStorage.hh + InputProcessing/DataStorage.hh + InputProcessing/EmbeddedEpJSONSchema.hh + "${CMAKE_CURRENT_BINARY_DIR}/EmbeddedEpJSONSchema.cc" + IOFiles.cc + IOFiles.hh + InputProcessing/IdfParser.cc + InputProcessing/IdfParser.hh + InputProcessing/InputProcessor.cc + InputProcessing/InputProcessor.hh + InputProcessing/InputValidation.cc + InputProcessing/InputValidation.hh + IntegratedHeatPump.cc + IntegratedHeatPump.hh + InternalHeatGains.cc + InternalHeatGains.hh + LowTempRadiantSystem.cc + LowTempRadiantSystem.hh + Material.hh + MatrixDataManager.cc + MatrixDataManager.hh + MicroCHPElectricGenerator.cc + MicroCHPElectricGenerator.hh + MicroturbineElectricGenerator.cc + MicroturbineElectricGenerator.hh + MixedAir.cc + MixedAir.hh + MixerComponent.cc + MixerComponent.hh + MoistureBalanceEMPDManager.cc + MoistureBalanceEMPDManager.hh + MundtSimMgr.cc + MundtSimMgr.hh + NodeInputManager.cc + NodeInputManager.hh + NonZoneEquipmentManager.cc + NonZoneEquipmentManager.hh + OutAirNodeManager.cc + OutAirNodeManager.hh + OutdoorAirUnit.cc + OutdoorAirUnit.hh + OutputProcessor.cc + OutputProcessor.hh + OutputReportData.cc + OutputReportData.hh + OutputReportPredefined.cc + OutputReportPredefined.hh + OutputReportTabular.cc + OutputReportTabular.hh + OutputReportTabularAnnual.cc + OutputReportTabularAnnual.hh + OutputReports.cc + OutputReports.hh + OutsideEnergySources.cc + OutsideEnergySources.hh + PVWatts.cc + PVWatts.hh + PackagedTerminalHeatPump.cc + PackagedTerminalHeatPump.hh + PackagedThermalStorageCoil.cc + PackagedThermalStorageCoil.hh + PhaseChangeModeling/HysteresisModel.cc + PhaseChangeModeling/HysteresisModel.hh + PhotovoltaicThermalCollectors.cc + PhotovoltaicThermalCollectors.hh + Photovoltaics.cc + Photovoltaics.hh + PierceSurface.hh + PipeHeatTransfer.cc + PipeHeatTransfer.hh + Pipes.cc + Pipes.hh + Plant/Branch.cc + Plant/Branch.hh + Plant/CallingOrder.hh + Plant/Component.cc + Plant/Component.hh + Plant/ConnectedLoopData.hh + Plant/Connection.hh + Plant/DataPlant.cc + Plant/DataPlant.hh + Plant/Enums.hh + Plant/EquipAndOperations.hh + Plant/Loop.cc + Plant/Loop.hh + Plant/LoopSide.cc + Plant/LoopSide.hh + Plant/LoopSidePumpInformation.hh + Plant/MeterData.hh + Plant/MixerData.hh + Plant/PlantAvailManager.hh + Plant/PlantConvergencePoint.hh + Plant/PlantLocation.hh + Plant/PlantManager.cc + Plant/PlantManager.hh + Plant/ReportBranchData.hh + Plant/ReportCompData.hh + Plant/ReportLoopData.hh + Plant/SplitterData.hh + Plant/Subcomponents.hh + PlantCentralGSHP.cc + PlantCentralGSHP.hh + PlantChillers.cc + PlantChillers.hh + PlantComponent.hh + PlantComponentTemperatureSources.cc + PlantComponentTemperatureSources.hh + PlantCondLoopOperation.cc + PlantCondLoopOperation.hh + PlantHeatExchangerFluidToFluid.cc + PlantHeatExchangerFluidToFluid.hh + PlantLoadProfile.cc + PlantLoadProfile.hh + PlantLoopHeatPumpEIR.cc + PlantLoopHeatPumpEIR.hh + PlantPipingSystemsManager.cc + PlantPipingSystemsManager.hh + PlantPressureSystem.cc + PlantPressureSystem.hh + PlantUtilities.cc + PlantUtilities.hh + PlantValves.cc + PlantValves.hh + Platform.hh + PluginManager.cc + PluginManager.hh + PollutionModule.cc + PollutionModule.hh + PondGroundHeatExchanger.cc + PondGroundHeatExchanger.hh + PoweredInductionUnits.cc + PoweredInductionUnits.hh + Psychrometrics.cc + Psychrometrics.hh + Pumps.cc + Pumps.hh + PurchasedAirManager.cc + PurchasedAirManager.hh + RefrigeratedCase.cc + RefrigeratedCase.hh + ReportCoilSelection.cc + ReportCoilSelection.hh + ResultsFramework.cc + ResultsFramework.hh + ReturnAirPathManager.cc + ReturnAirPathManager.hh + RoomAirModelAirflowNetwork.cc + RoomAirModelAirflowNetwork.hh + RoomAirModelManager.cc + RoomAirModelManager.hh + RoomAirModelUserTempPattern.cc + RoomAirModelUserTempPattern.hh + RootFinder.cc + RootFinder.hh + RuntimeLanguageProcessor.cc + RuntimeLanguageProcessor.hh + SQLiteProcedures.cc + SQLiteProcedures.hh + SZVAVModel.cc + SZVAVModel.hh + ScheduleManager.cc + ScheduleManager.hh + SetPointManager.cc + SetPointManager.hh + Shape.hh + SimAirServingZones.cc + SimAirServingZones.hh + SimulationManager.cc + SimulationManager.hh + SingleDuct.cc + SingleDuct.hh + SizingAnalysisObjects.cc + SizingAnalysisObjects.hh + SizingManager.cc + SizingManager.hh + SolarCollectors.cc + SolarCollectors.hh + SolarReflectionManager.cc + SolarReflectionManager.hh + SolarShading.cc + SolarShading.hh + SortAndStringUtilities.cc + SortAndStringUtilities.hh + SplitterComponent.cc + SplitterComponent.hh + StandardRatings.cc + StandardRatings.hh + StateManagement.cc + StateManagement.hh + SteamBaseboardRadiator.cc + SteamBaseboardRadiator.hh + SteamCoils.cc + SteamCoils.hh + StringUtilities.hh + SurfaceGeometry.cc + SurfaceGeometry.hh + SurfaceGroundHeatExchanger.cc + SurfaceGroundHeatExchanger.hh + SurfaceOctree.cc + SurfaceOctree.hh + SwimmingPool.cc + SwimmingPool.hh + SystemAvailabilityManager.cc + SystemAvailabilityManager.hh + SystemReports.cc + SystemReports.hh + TARCOGArgs.cc + TARCOGArgs.hh + TARCOGCommon.cc + TARCOGCommon.hh + TARCOGDeflection.cc + TARCOGDeflection.hh + TARCOGGasses90.cc + TARCOGGasses90.hh + TARCOGGassesParams.hh + TARCOGMain.cc + TARCOGMain.hh + TARCOGOutput.cc + TARCOGOutput.hh + TARCOGParams.cc + TARCOGParams.hh + TarcogShading.cc + TarcogShading.hh + TempSolveRoot.cc + TempSolveRoot.hh + ThermalChimney.cc + ThermalChimney.hh + ThermalComfort.cc + ThermalComfort.hh + ThermalEN673Calc.cc + ThermalEN673Calc.hh + ThermalISO15099Calc.cc + ThermalISO15099Calc.hh + Timer.h + TranspiredCollector.cc + TranspiredCollector.hh + UFADManager.cc + UFADManager.hh + UnitHeater.cc + UnitHeater.hh + UnitVentilator.cc + UnitVentilator.hh + UnitarySystem.cc + UnitarySystem.hh + UserDefinedComponents.cc + UserDefinedComponents.hh + UtilityRoutines.cc + UtilityRoutines.hh + VariableSpeedCoils.cc + VariableSpeedCoils.hh + Vectors.cc + Vectors.hh + VentilatedSlab.cc + VentilatedSlab.hh + WaterCoils.cc + WaterCoils.hh + WaterManager.cc + WaterManager.hh + WaterThermalTanks.cc + WaterThermalTanks.hh + WaterToAirHeatPump.cc + WaterToAirHeatPump.hh + WaterToAirHeatPumpSimple.cc + WaterToAirHeatPumpSimple.hh + WaterToWaterHeatPumps.hh + WaterUse.cc + WaterUse.hh + WeatherManager.cc + WeatherManager.hh + WindTurbine.cc + WindTurbine.hh + WindowAC.cc + WindowAC.hh + WindowComplexManager.cc + WindowComplexManager.hh + WindowEquivalentLayer.cc + WindowEquivalentLayer.hh + WindowManager.cc + WindowManager.hh + WindowManagerExteriorData.cc + WindowManagerExteriorData.hh + WindowManagerExteriorOptical.cc + WindowManagerExteriorOptical.hh + WindowManagerExteriorThermal.cc + WindowManagerExteriorThermal.hh + WindowModel.cc + WindowModel.hh + ZoneAirLoopEquipmentManager.cc + ZoneAirLoopEquipmentManager.hh + ZoneContaminantPredictorCorrector.cc + ZoneContaminantPredictorCorrector.hh + ZoneDehumidifier.cc + ZoneDehumidifier.hh + ZoneEquipmentManager.cc + ZoneEquipmentManager.hh + ZonePlenum.cc + ZonePlenum.hh + ZoneTempPredictorCorrector.cc + ZoneTempPredictorCorrector.hh) create_src_groups("${SRC}") @@ -722,13 +718,10 @@ create_src_groups("${INPUTPARSING_SRC}") add_custom_target( GenerateEmbeddedEpJSONSchema COMMAND - ${CMAKE_COMMAND} -D "EnergyPlus_SOURCE_DIR:PATH=${CMAKE_CURRENT_SOURCE_DIR}" - -D - "EnergyPlus_RUNTIME_OUTPUT_DIRECTORY:PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" - -D "EnergyPlus_BINARY_DIR:PATH=${CMAKE_CURRENT_BINARY_DIR}" -D + ${CMAKE_COMMAND} -D "EnergyPlus_SOURCE_DIR:PATH=${CMAKE_CURRENT_SOURCE_DIR}" -D + "EnergyPlus_RUNTIME_OUTPUT_DIRECTORY:PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}" -D "EnergyPlus_BINARY_DIR:PATH=${CMAKE_CURRENT_BINARY_DIR}" -D "EnergyPlus_CURRENT_BINARY_DIR:PATH=${CMAKE_CURRENT_BINARY_DIR}" -D - "EnergyPlus_embeddable_epJSON_schema:PATH=$" - -P + "EnergyPlus_embeddable_epJSON_schema:PATH=$" -P "${PROJECT_SOURCE_DIR}/scripts/dev/generate_embeddable_epJSON_schema/generate_embedded_epJSON_schema.cmake" WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} DEPENDS generate_embeddedable_epJSON_schema) @@ -740,36 +733,23 @@ if(LINK_WITH_PYTHON) # to match up bitwise if we aren't, then the identified interpreter can be # whatever bit it wants if(MSVC) - execute_process( - COMMAND "${PYTHON_EXECUTABLE}" - "${PROJECT_SOURCE_DIR}/cmake/PythonGetBitSize.py" - OUTPUT_VARIABLE PYTHON_BIT_SIZE) + execute_process(COMMAND "${PYTHON_EXECUTABLE}" "${PROJECT_SOURCE_DIR}/cmake/PythonGetBitSize.py" OUTPUT_VARIABLE PYTHON_BIT_SIZE) # PYTHON_BIT_SIZE will be either "32" or "64" # CMAKE_EXE_LINKER_FLAGS:STRING=/machine:x64 # CMAKE_EXE_LINKER_FLAGS:STRING=/machine:X86 if("${PYTHON_BIT_SIZE}" EQUAL "32") string(FIND "${CMAKE_EXE_LINKER_FLAGS}" "86" PY_BITS_IN_ARCH) if("${PY_BITS_IN_ARCH}" GREATER -1) - message( - STATUS - "Architecture of Python lib and EnergyPlus build align at 32-bit") + message(STATUS "Architecture of Python lib and EnergyPlus build align at 32-bit") else() - message( - FATAL_ERROR - "Python is 32-bit while EnergyPlus architecture appears to be 64-bit!" - ) + message(FATAL_ERROR "Python is 32-bit while EnergyPlus architecture appears to be 64-bit!") endif() else() # assuming 64 bit string(FIND "${CMAKE_EXE_LINKER_FLAGS}" "64" PY_BITS_IN_ARCH) if("${PY_BITS_IN_ARCH}" GREATER -1) - message( - STATUS - "Architecture of Python lib and EnergyPlus build align at 64-bit") + message(STATUS "Architecture of Python lib and EnergyPlus build align at 64-bit") else() - message( - FATAL_ERROR - "Python is 64-bit while EnergyPlus architecture appears to be 32-bit!" - ) + message(FATAL_ERROR "Python is 64-bit while EnergyPlus architecture appears to be 32-bit!") endif() endif() endif() @@ -783,8 +763,7 @@ endif() add_library(energyplusparser STATIC ${INPUTPARSING_SRC}) add_dependencies(energyplusparser GenerateEmbeddedEpJSONSchema) target_link_libraries(energyplusparser PUBLIC re2 fmt::fmt ${CMAKE_DL_LIBS}) -target_link_libraries( - energyplusparser PRIVATE project_options project_fp_options project_warnings) +target_link_libraries(energyplusparser PRIVATE project_options project_fp_options project_warnings) if(WIN32) target_link_libraries(energyplusparser PUBLIC Shlwapi) endif() @@ -809,16 +788,14 @@ target_link_libraries( airflownetworklib ssc) -target_link_libraries(energypluslib PRIVATE project_options project_fp_options - project_warnings) +target_link_libraries(energypluslib PRIVATE project_options project_fp_options project_warnings) if(OPENGL_FOUND) target_link_libraries(energypluslib PUBLIC penumbra) endif() add_dependencies(energypluslib GenerateEmbeddedEpJSONSchema) if(BUILD_GROUND_PLOT) - set_source_files_properties(HeatBalanceKivaManager.cc - PROPERTIES COMPILE_DEFINITIONS GROUND_PLOT) + set_source_files_properties(HeatBalanceKivaManager.cc PROPERTIES COMPILE_DEFINITIONS GROUND_PLOT) target_link_libraries(energypluslib PUBLIC groundplot) endif() @@ -827,8 +804,7 @@ if(WIN32) target_link_libraries(energypluslib PUBLIC Shlwapi) endif() if(UNIX AND NOT APPLE) - if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER - 9.0) + if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 9.0) target_link_libraries(energypluslib PUBLIC util) endif() endif() @@ -852,10 +828,7 @@ set(API_CORE_SRC # api/autosizing.cc api/EnergyPlusPgm.cc) -option( - BUILD_STATIC_ENERGYPLUS_API - "Build a static library instead of a shared library for the EnergyPlus API" - OFF) +option(BUILD_STATIC_ENERGYPLUS_API "Build a static library instead of a shared library for the EnergyPlus API" OFF) mark_as_advanced(BUILD_STATIC_ENERGYPLUS_API) if(BUILD_STATIC_ENERGYPLUS_API) set(API_LIBRARY_TYPE STATIC) @@ -865,21 +838,15 @@ else() endif() if(APPLE OR UNIX) - add_library( - energyplusapi ${API_LIBRARY_TYPE} CommandLineInterface.hh - CommandLineInterface.cc ${API_CORE_SRC} ${API_HEADERS}) + add_library(energyplusapi ${API_LIBRARY_TYPE} CommandLineInterface.hh CommandLineInterface.cc ${API_CORE_SRC} ${API_HEADERS}) else() # windows - add_library( - energyplusapi - ${API_LIBRARY_TYPE} CommandLineInterface.hh CommandLineInterface.cc - ${API_CORE_SRC} "${CMAKE_CURRENT_BINARY_DIR}/energyplusapi.rc") + add_library(energyplusapi ${API_LIBRARY_TYPE} CommandLineInterface.hh CommandLineInterface.cc ${API_CORE_SRC} + "${CMAKE_CURRENT_BINARY_DIR}/energyplusapi.rc") endif() target_link_libraries(energyplusapi PUBLIC energypluslib) -target_link_libraries(energyplusapi PRIVATE project_options project_fp_options - project_warnings) +target_link_libraries(energyplusapi PRIVATE project_options project_fp_options project_warnings) -set_target_properties(energyplusapi PROPERTIES INSTALL_NAME_DIR - "@executable_path") +set_target_properties(energyplusapi PROPERTIES INSTALL_NAME_DIR "@executable_path") install( TARGETS energyplusapi RUNTIME DESTINATION ./ @@ -892,8 +859,7 @@ if(APPLE OR UNIX) else() # windows add_executable(energyplus main.cc "${CMAKE_CURRENT_BINARY_DIR}/energyplus.rc") endif() -target_link_libraries(energyplus PRIVATE energyplusapi project_options - project_fp_options project_warnings) +target_link_libraries(energyplus PRIVATE energyplusapi project_options project_fp_options project_warnings) set_target_properties(energyplus PROPERTIES VERSION ${ENERGYPLUS_VERSION}) set_target_properties(energyplusapi PROPERTIES VERSION ${ENERGYPLUS_VERSION}) @@ -909,14 +875,9 @@ add_custom_command( DEPENDS __ALWAYSRUNME COMMAND - ${CMAKE_COMMAND} -DREPO_ROOT=${PROJECT_SOURCE_DIR} - -DEXECUTABLE_PATH=$ - -DCMAKE_VERSION_MAJOR="${CMAKE_VERSION_MAJOR}" - -DCMAKE_VERSION_MINOR="${CMAKE_VERSION_MINOR}" - -DCMAKE_VERSION_PATCH="${CMAKE_VERSION_PATCH}" - -DCMAKE_VERSION_BUILD="${CMAKE_VERSION_BUILD}" - -DPYTHON_API_VERSION_MAJOR="${PYTHON_API_VERSION_MAJOR}" - -DPYTHON_API_VERSION_MINOR="${PYTHON_API_VERSION_MINOR}" -P + ${CMAKE_COMMAND} -DREPO_ROOT=${PROJECT_SOURCE_DIR} -DEXECUTABLE_PATH=$ -DCMAKE_VERSION_MAJOR="${CMAKE_VERSION_MAJOR}" + -DCMAKE_VERSION_MINOR="${CMAKE_VERSION_MINOR}" -DCMAKE_VERSION_PATCH="${CMAKE_VERSION_PATCH}" -DCMAKE_VERSION_BUILD="${CMAKE_VERSION_BUILD}" + -DPYTHON_API_VERSION_MAJOR="${PYTHON_API_VERSION_MAJOR}" -DPYTHON_API_VERSION_MINOR="${PYTHON_API_VERSION_MINOR}" -P "${PROJECT_SOURCE_DIR}/cmake/PythonSetupAPIinBuild.cmake") install(TARGETS energyplus energyplusapi DESTINATION ./) @@ -930,10 +891,8 @@ if(LINK_WITH_PYTHON) add_custom_command( TARGET energyplusapi POST_BUILD - COMMAND - ${CMAKE_COMMAND} -DRESOLVED_PYTHON_LIB=${RESOLVED_PYTHON_LIBRARY} - -DEXECUTABLE_PATH=$ -P - ${PROJECT_SOURCE_DIR}/cmake/PythonGetLibAndLinkUp.cmake) + COMMAND ${CMAKE_COMMAND} -DRESOLVED_PYTHON_LIB=${RESOLVED_PYTHON_LIBRARY} -DEXECUTABLE_PATH=$ -P + ${PROJECT_SOURCE_DIR}/cmake/PythonGetLibAndLinkUp.cmake) endif() install( CODE "execute_process( @@ -957,10 +916,7 @@ if(LINK_WITH_PYTHON) TARGET energyplusapi POST_BUILD # TODO: I don't think we want to quote the generator expression # here - COMMAND - ${PYTHON_EXECUTABLE} - "${PROJECT_SOURCE_DIR}/cmake/PythonCopyStandardLib.py" - "$" "python_standard_lib") + COMMAND ${PYTHON_EXECUTABLE} "${PROJECT_SOURCE_DIR}/cmake/PythonCopyStandardLib.py" "$" "python_standard_lib") endif() if(BUILD_PACKAGE) @@ -968,47 +924,32 @@ if(BUILD_PACKAGE) if(LINK_WITH_PYTHON) # we'll want to grab the standard lib for python plugins TODO: I don't think # we want to quote the generator expression - install(DIRECTORY "$/python_standard_lib/" - DESTINATION "./python_standard_lib") + install(DIRECTORY "$/python_standard_lib/" DESTINATION "./python_standard_lib") endif() # we'll want to always provide the C API headers foreach(HEADER ${API_HEADERS}) - install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/${HEADER}" - DESTINATION "./include/EnergyPlus/api") + install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/${HEADER}" DESTINATION "./include/EnergyPlus/api") endforeach() # we'll want to always grab the python API wrapper TODO: I don't think we want # to quote the generator expression - install(DIRECTORY "$/pyenergyplus/" - DESTINATION "./pyenergyplus") + install(DIRECTORY "$/pyenergyplus/" DESTINATION "./pyenergyplus") endif() if(BUILD_TESTING) # Build the test executable add_executable(TestEnergyPlusCallbacks test_ep_as_library.cc) - target_link_libraries( - TestEnergyPlusCallbacks PRIVATE energyplusapi project_options - project_fp_options project_warnings) - add_test( - NAME "API.LegacyCallbackTest" - COMMAND - ${CMAKE_COMMAND} -DSOURCE_DIR=${PROJECT_SOURCE_DIR} - -DBINARY_DIR=${PROJECT_BINARY_DIR} -DIDF_FILE=1ZoneUncontrolled.idf - -DEPW_FILE=USA_CO_Golden-NREL.724666_TMY3.epw -P - ${PROJECT_SOURCE_DIR}/cmake/RunCallbackTest.cmake) + target_link_libraries(TestEnergyPlusCallbacks PRIVATE energyplusapi project_options project_fp_options project_warnings) + add_test(NAME "API.LegacyCallbackTest" + COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=${PROJECT_SOURCE_DIR} -DBINARY_DIR=${PROJECT_BINARY_DIR} -DIDF_FILE=1ZoneUncontrolled.idf + -DEPW_FILE=USA_CO_Golden-NREL.724666_TMY3.epw -P ${PROJECT_SOURCE_DIR}/cmake/RunCallbackTest.cmake) - set(EPW_FILE - "${PROJECT_SOURCE_DIR}/weather/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw" - ) + set(EPW_FILE "${PROJECT_SOURCE_DIR}/weather/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw") set(IDF_FILE "${PROJECT_SOURCE_DIR}/testfiles/1ZoneUncontrolled.idf") - add_executable(TestAPI_Functional_C - ${PROJECT_SOURCE_DIR}/tst/EnergyPlus/api/TestFunctional.c) - target_link_libraries( - TestAPI_Functional_C PRIVATE energyplusapi project_options - project_fp_options project_warnings) + add_executable(TestAPI_Functional_C ${PROJECT_SOURCE_DIR}/tst/EnergyPlus/api/TestFunctional.c) + target_link_libraries(TestAPI_Functional_C PRIVATE energyplusapi project_options project_fp_options project_warnings) if(NOT MSVC) - target_compile_options(TestAPI_Functional_C PRIVATE -Wno-unused - -Wno-unused-parameter) + target_compile_options(TestAPI_Functional_C PRIVATE -Wno-unused -Wno-unused-parameter) endif() add_test(NAME "API.TestFunctionalC" COMMAND TestAPI_Functional_C) @@ -1016,25 +957,17 @@ if(BUILD_TESTING) set(TEST_DIR "${PROJECT_BINARY_DIR}/tst/api/runtime") file(MAKE_DIRECTORY ${TEST_DIR}) - add_executable(TestAPI_Runtime_C - ${PROJECT_SOURCE_DIR}/tst/EnergyPlus/api/TestRuntime.c) - target_link_libraries(TestAPI_Runtime_C PRIVATE energyplusapi project_options - project_fp_options) + add_executable(TestAPI_Runtime_C ${PROJECT_SOURCE_DIR}/tst/EnergyPlus/api/TestRuntime.c) + target_link_libraries(TestAPI_Runtime_C PRIVATE energyplusapi project_options project_fp_options) # target_compile_options(TestAPI_Runtime_C PRIVATE -Wall -Wextra -Wno-unused) - add_test(NAME "API.TestRuntimeC" COMMAND TestAPI_Runtime_C -d "${TEST_DIR}" - -w "${EPW_FILE}" -D "${IDF_FILE}") + add_test(NAME "API.TestRuntimeC" COMMAND TestAPI_Runtime_C -d "${TEST_DIR}" -w "${EPW_FILE}" -D "${IDF_FILE}") set(TEST_DIR "${PROJECT_BINARY_DIR}/tst/api/exchange") file(MAKE_DIRECTORY ${TEST_DIR}) - add_executable(TestAPI_DataTransfer_C - ${PROJECT_SOURCE_DIR}/tst/EnergyPlus/api/TestDataTransfer.c) - target_link_libraries( - TestAPI_DataTransfer_C PRIVATE energyplusapi project_options - project_fp_options project_warnings) - add_test(NAME "API.TestDataTransferC" - COMMAND TestAPI_DataTransfer_C -d "${TEST_DIR}" -w "${EPW_FILE}" -D - "${IDF_FILE}") + add_executable(TestAPI_DataTransfer_C ${PROJECT_SOURCE_DIR}/tst/EnergyPlus/api/TestDataTransfer.c) + target_link_libraries(TestAPI_DataTransfer_C PRIVATE energyplusapi project_options project_fp_options project_warnings) + add_test(NAME "API.TestDataTransferC" COMMAND TestAPI_DataTransfer_C -d "${TEST_DIR}" -w "${EPW_FILE}" -D "${IDF_FILE}") # set(TEST_DIR "${PROJECT_BINARY_DIR}/tst/api/autosizing") file(MAKE_DIRECTORY # ${TEST_DIR}) add_executable( TestAPI_Autosizing_C @@ -1049,8 +982,7 @@ if(BUILD_TESTING) if(NOT MSVC) set(API_TEST_TARGET_DIR "${PROJECT_BINARY_DIR}/Products") - configure_file("${PROJECT_SOURCE_DIR}/tst/EnergyPlus/api/TestFunctional.py" - "${API_TEST_TARGET_DIR}/TestFunctional.py") + configure_file("${PROJECT_SOURCE_DIR}/tst/EnergyPlus/api/TestFunctional.py" "${API_TEST_TARGET_DIR}/TestFunctional.py") add_test( NAME "API.TestFunctionalPython" COMMAND "${PYTHON_EXECUTABLE}" "${API_TEST_TARGET_DIR}/TestFunctional.py" @@ -1058,24 +990,18 @@ if(BUILD_TESTING) set(TEST_DIR "${PROJECT_BINARY_DIR}/tst/api/runtime_python") file(MAKE_DIRECTORY ${TEST_DIR}) - configure_file("${PROJECT_SOURCE_DIR}/tst/EnergyPlus/api/TestRuntime.py" - "${API_TEST_TARGET_DIR}/TestRuntime.py") + configure_file("${PROJECT_SOURCE_DIR}/tst/EnergyPlus/api/TestRuntime.py" "${API_TEST_TARGET_DIR}/TestRuntime.py") add_test( NAME "API.TestRuntimePython" - COMMAND "${PYTHON_EXECUTABLE}" "${API_TEST_TARGET_DIR}/TestRuntime.py" -d - "${TEST_DIR}" -w "${EPW_FILE}" -D "${IDF_FILE}" + COMMAND "${PYTHON_EXECUTABLE}" "${API_TEST_TARGET_DIR}/TestRuntime.py" -d "${TEST_DIR}" -w "${EPW_FILE}" -D "${IDF_FILE}" WORKING_DIRECTORY "${API_TEST_TARGET_DIR}") set(TEST_DIR "${PROJECT_BINARY_DIR}/tst/api/exchange_python") file(MAKE_DIRECTORY ${TEST_DIR}) - configure_file( - "${PROJECT_SOURCE_DIR}/tst/EnergyPlus/api/TestDataTransfer.py" - "${API_TEST_TARGET_DIR}/TestDataTransfer.py") + configure_file("${PROJECT_SOURCE_DIR}/tst/EnergyPlus/api/TestDataTransfer.py" "${API_TEST_TARGET_DIR}/TestDataTransfer.py") add_test( NAME "API.TestDataTransferPython" - COMMAND - "${PYTHON_EXECUTABLE}" "${API_TEST_TARGET_DIR}/TestDataTransfer.py" -d - "${TEST_DIR}" -w "${EPW_FILE}" -D "${IDF_FILE}" + COMMAND "${PYTHON_EXECUTABLE}" "${API_TEST_TARGET_DIR}/TestDataTransfer.py" -d "${TEST_DIR}" -w "${EPW_FILE}" -D "${IDF_FILE}" WORKING_DIRECTORY "${API_TEST_TARGET_DIR}") # set(TEST_DIR "${PROJECT_BINARY_DIR}/tst/api/autosizing_python") @@ -1088,22 +1014,16 @@ if(BUILD_TESTING) set(TEST_DIR "${PROJECT_BINARY_DIR}/tst/api/plugin_tester_tester") file(MAKE_DIRECTORY ${TEST_DIR}) - configure_file("${PROJECT_SOURCE_DIR}/src/EnergyPlus/api/plugin_tester.py" - "${API_TEST_TARGET_DIR}/plugin_tester.py") + configure_file("${PROJECT_SOURCE_DIR}/src/EnergyPlus/api/plugin_tester.py" "${API_TEST_TARGET_DIR}/plugin_tester.py") add_test( NAME "API.PluginTesterTester" - COMMAND - "${PYTHON_EXECUTABLE}" "${API_TEST_TARGET_DIR}/plugin_tester.py" - "${PROJECT_SOURCE_DIR}/testfiles/PythonPluginCustomTrendVariable.py" + COMMAND "${PYTHON_EXECUTABLE}" "${API_TEST_TARGET_DIR}/plugin_tester.py" "${PROJECT_SOURCE_DIR}/testfiles/PythonPluginCustomTrendVariable.py" WORKING_DIRECTORY "${API_TEST_TARGET_DIR}") - configure_file( - "${PROJECT_SOURCE_DIR}/tst/EnergyPlus/api/test_DataTransferTypes.py" - "${API_TEST_TARGET_DIR}/test_DataTransferTypes.py" COPYONLY) + configure_file("${PROJECT_SOURCE_DIR}/tst/EnergyPlus/api/test_DataTransferTypes.py" "${API_TEST_TARGET_DIR}/test_DataTransferTypes.py" COPYONLY) add_test( NAME "API.test_DataTransferTypes" - COMMAND "${PYTHON_EXECUTABLE}" -m unittest - "${API_TEST_TARGET_DIR}/test_DataTransferTypes.py" + COMMAND "${PYTHON_EXECUTABLE}" -m unittest "${API_TEST_TARGET_DIR}/test_DataTransferTypes.py" WORKING_DIRECTORY "${API_TEST_TARGET_DIR}") endif() @@ -1114,6 +1034,5 @@ if(UNIX AND NOT APPLE) TARGET energyplus POST_BUILD COMMAND ${CMAKE_COMMAND} -E create_symlink energyplus EnergyPlus - COMMAND ${CMAKE_COMMAND} -E rename EnergyPlus - "${PROJECT_BINARY_DIR}/Products/EnergyPlus") + COMMAND ${CMAKE_COMMAND} -E rename EnergyPlus "${PROJECT_BINARY_DIR}/Products/EnergyPlus") endif() diff --git a/src/ExpandObjects/CMakeLists.txt b/src/ExpandObjects/CMakeLists.txt index 0105e30b38d..d9f9b920978 100644 --- a/src/ExpandObjects/CMakeLists.txt +++ b/src/ExpandObjects/CMakeLists.txt @@ -4,12 +4,12 @@ cmake_minimum_required(VERSION 3.5.1) cmake_policy(SET CMP0012 NEW) # if() recognizes boolean constants -set( CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products" ) -set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products" ) -set( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products" ) +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products") +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products") +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products") if(WIN32) - configure_file( ExpandObjects.rc.in "${CMAKE_CURRENT_BINARY_DIR}/ExpandObjects.rc" ) + configure_file(ExpandObjects.rc.in "${CMAKE_CURRENT_BINARY_DIR}/ExpandObjects.rc") endif() set(SRC epfilter.f90) @@ -39,7 +39,7 @@ elseif(UNIX) set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -ffree-line-length-200") set(STATIC_EXE TRUE) endif() -else() # Windows +else() # Windows set(STATIC_EXE TRUE) if(CMAKE_Fortran_COMPILER MATCHES "ifort") # Set release flags to be empty @@ -56,18 +56,16 @@ else() # Windows endif() set(SKIP_BUILD_RPATH TRUE) -if (APPLE OR UNIX) - add_executable( ExpandObjects ${SRC} ) -else() # windows - add_executable( ExpandObjects ${SRC} "${CMAKE_CURRENT_BINARY_DIR}/ExpandObjects.rc" ) +if(APPLE OR UNIX) + add_executable(ExpandObjects ${SRC}) +else() # windows + add_executable(ExpandObjects ${SRC} "${CMAKE_CURRENT_BINARY_DIR}/ExpandObjects.rc") endif() set_target_properties(ExpandObjects PROPERTIES FOLDER Auxiliary) - -install( TARGETS ExpandObjects DESTINATION "./" ) +install(TARGETS ExpandObjects DESTINATION "./") if(NOT ${STATIC_EXE}) include("${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/ProjectMacros.cmake") - install_target_prereqs( ExpandObjects "./" ) + install_target_prereqs(ExpandObjects "./") endif() - diff --git a/src/ParametricPreprocessor/CMakeLists.txt b/src/ParametricPreprocessor/CMakeLists.txt index 209fe55bf35..dd32a28bdf1 100644 --- a/src/ParametricPreprocessor/CMakeLists.txt +++ b/src/ParametricPreprocessor/CMakeLists.txt @@ -4,9 +4,9 @@ cmake_minimum_required(VERSION 3.5.1) cmake_policy(SET CMP0012 NEW) # if() recognizes boolean constants -set( CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products" ) -set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products" ) -set( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products" ) +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products") +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products") +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products") set(SRC ParametricPreprocessor.f90) @@ -14,14 +14,14 @@ set(STATIC_EXE FALSE) if(APPLE) if(CMAKE_Fortran_COMPILER MATCHES "ifort") - set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -static-intel" ) + set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -static-intel") endif() elseif(UNIX) set(CMAKE_SKIP_RPATH TRUE) if(CMAKE_Fortran_COMPILER MATCHES "ifort") - set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -static-intel" ) + set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -static-intel") else() - set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -static" ) + set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -static") set(STATIC_EXE TRUE) endif() else() @@ -36,16 +36,13 @@ else() endif() set(SKIP_BUILD_RPATH true) -add_executable( ParametricPreprocessor ${SRC} ) +add_executable(ParametricPreprocessor ${SRC}) set_target_properties(ParametricPreprocessor PROPERTIES FOLDER Auxiliary) -set_target_properties(ParametricPreprocessor PROPERTIES - COMPILE_FLAGS "-ffree-line-length-200 ${SHARED_FLAGS}" -) +set_target_properties(ParametricPreprocessor PROPERTIES COMPILE_FLAGS "-ffree-line-length-200 ${SHARED_FLAGS}") -install( TARGETS ParametricPreprocessor DESTINATION PreProcess/ParametricPreprocessor ) +install(TARGETS ParametricPreprocessor DESTINATION PreProcess/ParametricPreprocessor) if(NOT ${STATIC_EXE}) include("${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/ProjectMacros.cmake") - install_target_prereqs( ParametricPreprocessor PreProcess/ParametricPreprocessor ) + install_target_prereqs(ParametricPreprocessor PreProcess/ParametricPreprocessor) endif() - diff --git a/src/ReadVars/CMakeLists.txt b/src/ReadVars/CMakeLists.txt index bf5e1456c22..b32d4499e08 100644 --- a/src/ReadVars/CMakeLists.txt +++ b/src/ReadVars/CMakeLists.txt @@ -4,9 +4,9 @@ cmake_minimum_required(VERSION 3.5.1) cmake_policy(SET CMP0012 NEW) # if() recognizes boolean constants -set( CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products" ) -set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products" ) -set( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products" ) +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products") +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products") +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products") set(SRC ReadVarsESO.f90) @@ -14,14 +14,14 @@ set(STATIC_EXE FALSE) if(APPLE) if(CMAKE_Fortran_COMPILER MATCHES "ifort") - set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -static-intel" ) + set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -static-intel") endif() elseif(UNIX) set(CMAKE_SKIP_RPATH TRUE) if(CMAKE_Fortran_COMPILER MATCHES "ifort") - set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -static-intel" ) + set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -static-intel") else() - set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -static" ) + set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -static") set(STATIC_EXE TRUE) endif() else() @@ -36,12 +36,11 @@ else() endif() set(SKIP_BUILD_RPATH true) -add_executable( ReadVarsESO ${SRC} ) +add_executable(ReadVarsESO ${SRC}) set_target_properties(ReadVarsESO PROPERTIES FOLDER Auxiliary) -install( TARGETS ReadVarsESO DESTINATION PostProcess ) +install(TARGETS ReadVarsESO DESTINATION PostProcess) if(NOT ${STATIC_EXE}) include("${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/ProjectMacros.cmake") - install_target_prereqs( ReadVarsESO PostProcess ) + install_target_prereqs(ReadVarsESO PostProcess) endif() - diff --git a/src/Slab/CMakeLists.txt b/src/Slab/CMakeLists.txt index 1f26f69658b..0199fe4984d 100644 --- a/src/Slab/CMakeLists.txt +++ b/src/Slab/CMakeLists.txt @@ -4,37 +4,36 @@ cmake_minimum_required(VERSION 3.5.1) cmake_policy(SET CMP0012 NEW) # if() recognizes boolean constants -set( CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products" ) -set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products" ) -set( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products" ) +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products") +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products") +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products") set(SRC - 3DSlabHT.f90 - DataGlobals.f90 - DataStringGlobals.f90 - EPWRead.f90 - General.f90 - MainProgram.f90 - UtilityRoutines.f90 - DataPrecisionGlobals.f90 - EPWPrecisionGlobals.f90 - EPWWeather.f90 - InputProcessor.f90 - SimData.f90 -) + 3DSlabHT.f90 + DataGlobals.f90 + DataStringGlobals.f90 + EPWRead.f90 + General.f90 + MainProgram.f90 + UtilityRoutines.f90 + DataPrecisionGlobals.f90 + EPWPrecisionGlobals.f90 + EPWWeather.f90 + InputProcessor.f90 + SimData.f90) set(STATIC_EXE FALSE) if(APPLE) if(CMAKE_Fortran_COMPILER MATCHES "ifort") - set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -static-intel" ) + set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -static-intel") endif() elseif(UNIX) set(CMAKE_SKIP_RPATH TRUE) if(CMAKE_Fortran_COMPILER MATCHES "ifort") - set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -static-intel" ) + set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -static-intel") else() - set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -static" ) + set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -static") set(STATIC_EXE TRUE) endif() else() @@ -49,17 +48,14 @@ else() endif() set(SKIP_BUILD_RPATH TRUE) -add_executable( Slab ${SRC} ) +add_executable(Slab ${SRC}) set_target_properties(Slab PROPERTIES FOLDER Auxiliary) -set_target_properties(Slab PROPERTIES - COMPILE_FLAGS "-ffree-line-length-200 ${SHARED_FLAGS}" -) +set_target_properties(Slab PROPERTIES COMPILE_FLAGS "-ffree-line-length-200 ${SHARED_FLAGS}") -install( TARGETS Slab DESTINATION PreProcess/GrndTempCalc ) +install(TARGETS Slab DESTINATION PreProcess/GrndTempCalc) if(NOT ${STATIC_EXE}) include("${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/ProjectMacros.cmake") - install_target_prereqs( Slab PreProcess/GrndTempCalc ) + install_target_prereqs(Slab PreProcess/GrndTempCalc) endif() install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/../../idd/SlabGHT.idd" DESTINATION "PreProcess/GrndTempCalc/") - diff --git a/src/Transition/CMakeLists.txt b/src/Transition/CMakeLists.txt index db7885961d5..1fdd2aa318c 100644 --- a/src/Transition/CMakeLists.txt +++ b/src/Transition/CMakeLists.txt @@ -4,72 +4,71 @@ cmake_minimum_required(VERSION 3.5.1) cmake_policy(SET CMP0012 NEW) # if() recognizes boolean constants -set( CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products" ) -set( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products" ) -set( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products" ) +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products") +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products") +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../Products") -include_directories( ${CMAKE_CURRENT_BINARY_DIR} ) +include_directories(${CMAKE_CURRENT_BINARY_DIR}) set(STATIC_EXE FALSE) # first create a static library of shared stuff set(LIB_SRC - DataGlobals.f90 - DataStringGlobals.f90 - DataVCompareGlobals.f90 - DisplayRoutines.f90 - General.f90 - InputProcessor.f90 - platformDepUtilityRoutines.f90 - SortAndStringUtilities.f90 - UtilityRoutines.f90 - VCompareGlobalRoutines.f90 - VCompareUtilityRoutines.f90 -) -add_library( TransitionLib STATIC ${LIB_SRC} ) - -list( APPEND VERSIONS 1_0_0 ) -list( APPEND VERSIONS 1_0_1 ) -list( APPEND VERSIONS 1_0_2 ) -list( APPEND VERSIONS 1_0_3 ) -list( APPEND VERSIONS 1_1_0 ) -list( APPEND VERSIONS 1_1_1 ) -list( APPEND VERSIONS 1_2_0 ) -list( APPEND VERSIONS 1_2_1 ) -list( APPEND VERSIONS 1_2_2 ) -list( APPEND VERSIONS 1_2_3 ) -list( APPEND VERSIONS 1_3_0 ) -list( APPEND VERSIONS 1_4_0 ) -list( APPEND VERSIONS 2_0_0 ) -list( APPEND VERSIONS 2_1_0 ) -list( APPEND VERSIONS 2_2_0 ) -list( APPEND VERSIONS 3_0_0 ) -list( APPEND VERSIONS 3_1_0 ) -list( APPEND VERSIONS 4_0_0 ) -list( APPEND VERSIONS 5_0_0 ) -list( APPEND VERSIONS 6_0_0 ) -list( APPEND VERSIONS 7_0_0 ) -list( APPEND VERSIONS 7_1_0 ) -list( APPEND VERSIONS 7_2_0 ) -list( APPEND VERSIONS 8_0_0 ) -list( APPEND VERSIONS 8_1_0 ) -list( APPEND VERSIONS 8_2_0 ) -list( APPEND VERSIONS 8_3_0 ) -list( APPEND VERSIONS 8_4_0 ) -list( APPEND VERSIONS 8_5_0 ) -list( APPEND VERSIONS 8_6_0 ) -list( APPEND VERSIONS 8_7_0 ) -list( APPEND VERSIONS 8_8_0 ) -list( APPEND VERSIONS 8_9_0 ) -list( APPEND VERSIONS 9_0_0 ) -list( APPEND VERSIONS 9_1_0 ) -list( APPEND VERSIONS 9_2_0 ) -list( APPEND VERSIONS 9_3_0 ) -list( APPEND VERSIONS 9_4_0 ) -list( APPEND VERSIONS 9_5_0 ) + DataGlobals.f90 + DataStringGlobals.f90 + DataVCompareGlobals.f90 + DisplayRoutines.f90 + General.f90 + InputProcessor.f90 + platformDepUtilityRoutines.f90 + SortAndStringUtilities.f90 + UtilityRoutines.f90 + VCompareGlobalRoutines.f90 + VCompareUtilityRoutines.f90) +add_library(TransitionLib STATIC ${LIB_SRC}) + +list(APPEND VERSIONS 1_0_0) +list(APPEND VERSIONS 1_0_1) +list(APPEND VERSIONS 1_0_2) +list(APPEND VERSIONS 1_0_3) +list(APPEND VERSIONS 1_1_0) +list(APPEND VERSIONS 1_1_1) +list(APPEND VERSIONS 1_2_0) +list(APPEND VERSIONS 1_2_1) +list(APPEND VERSIONS 1_2_2) +list(APPEND VERSIONS 1_2_3) +list(APPEND VERSIONS 1_3_0) +list(APPEND VERSIONS 1_4_0) +list(APPEND VERSIONS 2_0_0) +list(APPEND VERSIONS 2_1_0) +list(APPEND VERSIONS 2_2_0) +list(APPEND VERSIONS 3_0_0) +list(APPEND VERSIONS 3_1_0) +list(APPEND VERSIONS 4_0_0) +list(APPEND VERSIONS 5_0_0) +list(APPEND VERSIONS 6_0_0) +list(APPEND VERSIONS 7_0_0) +list(APPEND VERSIONS 7_1_0) +list(APPEND VERSIONS 7_2_0) +list(APPEND VERSIONS 8_0_0) +list(APPEND VERSIONS 8_1_0) +list(APPEND VERSIONS 8_2_0) +list(APPEND VERSIONS 8_3_0) +list(APPEND VERSIONS 8_4_0) +list(APPEND VERSIONS 8_5_0) +list(APPEND VERSIONS 8_6_0) +list(APPEND VERSIONS 8_7_0) +list(APPEND VERSIONS 8_8_0) +list(APPEND VERSIONS 8_9_0) +list(APPEND VERSIONS 9_0_0) +list(APPEND VERSIONS 9_1_0) +list(APPEND VERSIONS 9_2_0) +list(APPEND VERSIONS 9_3_0) +list(APPEND VERSIONS 9_4_0) +list(APPEND VERSIONS 9_5_0) if(APPLE) - if( "${CMAKE_Fortran_COMPILER_ID}" MATCHES "GNU" ) + if("${CMAKE_Fortran_COMPILER_ID}" MATCHES "GNU") if(NOT "Ninja" STREQUAL ${CMAKE_GENERATOR}) set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -cpp") endif() @@ -81,8 +80,8 @@ if(APPLE) endif() elseif(UNIX) set(CMAKE_SKIP_RPATH TRUE) - if( "${CMAKE_Fortran_COMPILER_ID}" MATCHES "GNU" ) - set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -static" ) + if("${CMAKE_Fortran_COMPILER_ID}" MATCHES "GNU") + set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -static") if(NOT "Ninja" STREQUAL ${CMAKE_GENERATOR}) set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -cpp") endif() @@ -93,9 +92,9 @@ elseif(UNIX) set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fpp") set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -static-intel") endif() -else() # Windows +else() # Windows set(STATIC_EXE TRUE) - if( "${CMAKE_Fortran_COMPILER_ID}" MATCHES "GNU" ) + if("${CMAKE_Fortran_COMPILER_ID}" MATCHES "GNU") set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -static") if(NOT "Ninja" STREQUAL ${CMAKE_GENERATOR}) set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -cpp") @@ -110,13 +109,13 @@ else() # Windows endif() endif() -list( LENGTH VERSIONS VERSIONS_SIZE) +list(LENGTH VERSIONS VERSIONS_SIZE) math(EXPR end "${VERSIONS_SIZE} - 1") include("${CMAKE_CURRENT_SOURCE_DIR}/../../cmake/ProjectMacros.cmake") -foreach( i RANGE 1 ${end} ) +foreach(i RANGE 1 ${end}) math(EXPR ii "${i} - 1") @@ -124,25 +123,22 @@ foreach( i RANGE 1 ${end} ) list(GET VERSIONS ${i} NEW_VERSION) # then create all the binaries using just the Transition source and the appropriate version of the main sub - set(SRC - Transition.f90 - CreateNewIDFUsingRulesV${NEW_VERSION}.f90 - ) + set(SRC Transition.f90 CreateNewIDFUsingRulesV${NEW_VERSION}.f90) - string( REPLACE _ - OLD-VERSION ${OLD_VERSION} ) - string( REPLACE _ - NEW-VERSION ${NEW_VERSION} ) + string(REPLACE _ - OLD-VERSION ${OLD_VERSION}) + string(REPLACE _ - NEW-VERSION ${NEW_VERSION}) - set(LAST_NAME "Transition-V${OLD-VERSION}-to-V${NEW-VERSION}" ) + set(LAST_NAME "Transition-V${OLD-VERSION}-to-V${NEW-VERSION}") - set(CMAKE_Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${LAST_NAME} ) - add_executable( "${LAST_NAME}" ${SRC} ) + set(CMAKE_Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${LAST_NAME}) + add_executable("${LAST_NAME}" ${SRC}) set_target_properties("${LAST_NAME}" PROPERTIES FOLDER Auxiliary) - target_link_libraries( "${LAST_NAME}" TransitionLib ) + target_link_libraries("${LAST_NAME}" TransitionLib) - if( "${i}" GREATER "22" ) - install( TARGETS "${LAST_NAME}" DESTINATION PreProcess/IDFVersionUpdater ) + if("${i}" GREATER "22") + install(TARGETS "${LAST_NAME}" DESTINATION PreProcess/IDFVersionUpdater) if(NOT ${STATIC_EXE}) - install_target_prereqs( "${LAST_NAME}" PreProcess/IDFVersionUpdater ) + install_target_prereqs("${LAST_NAME}" PreProcess/IDFVersionUpdater) endif() endif() diff --git a/testfiles/CMakeLists.txt b/testfiles/CMakeLists.txt index 81c4a30b9d7..a6de4f3fc01 100644 --- a/testfiles/CMakeLists.txt +++ b/testfiles/CMakeLists.txt @@ -185,7 +185,8 @@ add_simulation_test(IDF_FILE CoolingTower_VariableSpeed.idf EPW_FILE USA_IL_Chic add_simulation_test(IDF_FILE CoolingTower_VariableSpeed_CondEntTempReset.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw) add_simulation_test(IDF_FILE CoolingTower_VariableSpeed_CondEntTempReset_MultipleTowers.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw) add_simulation_test(IDF_FILE CoolingTower_VariableSpeed_IdealCondEntTempSetpoint.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw) -add_simulation_test(IDF_FILE CoolingTower_VariableSpeed_IdealCondEntTempSetpoint_MultipleTowers.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw) +add_simulation_test(IDF_FILE CoolingTower_VariableSpeed_IdealCondEntTempSetpoint_MultipleTowers.idf EPW_FILE + USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw) add_simulation_test(IDF_FILE CoolingTower_VariableSpeed_MultiCell.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw) add_simulation_test(IDF_FILE CooltowerSimpleTest.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw) add_simulation_test(IDF_FILE CooltowerSimpleTestwithVentilation.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw) @@ -193,11 +194,11 @@ add_simulation_test(IDF_FILE CrossVent_1Zone_AirflowNetwork.idf EPW_FILE USA_CA_ add_simulation_test(IDF_FILE CrossVent_1Zone_AirflowNetwork_with2CrossflowJets.idf EPW_FILE USA_CA_San.Francisco.Intl.AP.724940_TMY3.epw) add_simulation_test(IDF_FILE CustomSolarVisibleSpectrum_RefBldgSmallOfficeNew2004_Chicago.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw) add_simulation_test(IDF_FILE DDAutoSize.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw) -IF ( NOT WIN32 ) - add_simulation_test(IDF_FILE DElight-Detailed-Comparison.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw) - add_simulation_test(IDF_FILE DElightCFSLightShelf.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw) - add_simulation_test(IDF_FILE DElightCFSWindow.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw) -ENDIF () +if(NOT WIN32) + add_simulation_test(IDF_FILE DElight-Detailed-Comparison.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw) + add_simulation_test(IDF_FILE DElightCFSLightShelf.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw) + add_simulation_test(IDF_FILE DElightCFSWindow.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw) +endif() add_simulation_test(IDF_FILE DOAS_wNeutralSupplyAir_wFanCoilUnits.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw) add_simulation_test(IDF_FILE DOASDXCOIL_wADPBFMethod.idf EPW_FILE USA_FL_Miami.Intl.AP.722020_TMY3.epw) add_simulation_test(IDF_FILE DOASDXCOIL_wADPBFMethod_NoReturnPath.idf EPW_FILE USA_FL_Miami.Intl.AP.722020_TMY3.epw) @@ -242,7 +243,7 @@ add_simulation_test(IDF_FILE EMSPlantLoopOverrideControl.idf EPW_FILE USA_FL_Orl add_simulation_test(IDF_FILE EMSPlantOperation_largeOff.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw) add_simulation_test(IDF_FILE EMSReplaceTraditionalManagers_LargeOffice.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw) add_simulation_test(IDF_FILE EMSThermochromicWindow.idf EPW_FILE USA_NV_Las.Vegas-McCarran.Intl.AP.723860_TMY3.epw) -add_simulation_test(IDF_FILE EMSTestMathAndKill.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw EXPECT_FATAL) # Expected to Fatal +add_simulation_test(IDF_FILE EMSTestMathAndKill.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw EXPECT_FATAL) # Expected to Fatal add_simulation_test(IDF_FILE EMSUserDefined5ZoneAirCooled.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw) add_simulation_test(IDF_FILE EMSUserDefinedWindACAuto.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw) add_simulation_test(IDF_FILE EMSWindowShadeControl.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw) @@ -415,25 +416,25 @@ add_simulation_test(IDF_FILE PurchAirWithDaylighting.idf EPW_FILE USA_IL_Chicago add_simulation_test(IDF_FILE PurchAirWithDaylightingAndShadeControl.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw) add_simulation_test(IDF_FILE PurchAirWithDaylightingAngleFac.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw) add_simulation_test(IDF_FILE PurchAirWithDoubleFacadeDaylighting.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw) -if (LINK_WITH_PYTHON) -add_simulation_test(IDF_FILE PythonPlugin1ZoneUncontrolledCondFD.idf EPW_FILE USA_CO_Golden-NREL.724666_TMY3.epw) -add_simulation_test(IDF_FILE PythonPluginAirflowNetworkOpeningControlByHumidity.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw) -add_simulation_test(IDF_FILE PythonPluginConstantVolumePurchasedAir.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw) -add_simulation_test(IDF_FILE PythonPluginCurveOverride_PackagedTerminalHeatPump.idf EPW_FILE USA_FL_Miami.Intl.AP.722020_TMY3.epw) -add_simulation_test(IDF_FILE PythonPluginCustomOutputVariable.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw) -add_simulation_test(IDF_FILE PythonPluginCustomSchedule.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw) -add_simulation_test(IDF_FILE PythonPluginDemandManager_LargeOffice.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw) -add_simulation_test(IDF_FILE PythonPluginDiscreteAirSystemSizes.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw) -add_simulation_test(IDF_FILE PythonPluginPlantLoopOverrideControl.idf EPW_FILE USA_FL_Orlando.Intl.AP.722050_TMY3.epw) -add_simulation_test(IDF_FILE PythonPluginPlantOperation_largeOff.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw) -add_simulation_test(IDF_FILE PythonPluginReplaceTraditionalManagers_LargeOffice.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw) -add_simulation_test(IDF_FILE PythonPluginTestMathAndKill.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw EXPECT_FATAL) # Expected to Fatal -add_simulation_test(IDF_FILE PythonPluginThermochromicWindow.idf EPW_FILE USA_NV_Las.Vegas-McCarran.Intl.AP.723860_TMY3.epw) -add_simulation_test(IDF_FILE PythonPluginUserDefined5ZoneAirCooled.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw) -add_simulation_test(IDF_FILE PythonPluginUserDefinedWindACAuto.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw) -add_simulation_test(IDF_FILE PythonPluginWindowShadeControl.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw) -add_simulation_test(IDF_FILE PythonPluginLrgOff_GridStorageSmoothing.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw) -add_simulation_test(IDF_FILE PythonPluginCustomTrendVariable.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw) +if(LINK_WITH_PYTHON) + add_simulation_test(IDF_FILE PythonPlugin1ZoneUncontrolledCondFD.idf EPW_FILE USA_CO_Golden-NREL.724666_TMY3.epw) + add_simulation_test(IDF_FILE PythonPluginAirflowNetworkOpeningControlByHumidity.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw) + add_simulation_test(IDF_FILE PythonPluginConstantVolumePurchasedAir.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw) + add_simulation_test(IDF_FILE PythonPluginCurveOverride_PackagedTerminalHeatPump.idf EPW_FILE USA_FL_Miami.Intl.AP.722020_TMY3.epw) + add_simulation_test(IDF_FILE PythonPluginCustomOutputVariable.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw) + add_simulation_test(IDF_FILE PythonPluginCustomSchedule.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw) + add_simulation_test(IDF_FILE PythonPluginDemandManager_LargeOffice.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw) + add_simulation_test(IDF_FILE PythonPluginDiscreteAirSystemSizes.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw) + add_simulation_test(IDF_FILE PythonPluginPlantLoopOverrideControl.idf EPW_FILE USA_FL_Orlando.Intl.AP.722050_TMY3.epw) + add_simulation_test(IDF_FILE PythonPluginPlantOperation_largeOff.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw) + add_simulation_test(IDF_FILE PythonPluginReplaceTraditionalManagers_LargeOffice.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw) + add_simulation_test(IDF_FILE PythonPluginTestMathAndKill.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw EXPECT_FATAL) # Expected to Fatal + add_simulation_test(IDF_FILE PythonPluginThermochromicWindow.idf EPW_FILE USA_NV_Las.Vegas-McCarran.Intl.AP.723860_TMY3.epw) + add_simulation_test(IDF_FILE PythonPluginUserDefined5ZoneAirCooled.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw) + add_simulation_test(IDF_FILE PythonPluginUserDefinedWindACAuto.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw) + add_simulation_test(IDF_FILE PythonPluginWindowShadeControl.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw) + add_simulation_test(IDF_FILE PythonPluginLrgOff_GridStorageSmoothing.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw) + add_simulation_test(IDF_FILE PythonPluginCustomTrendVariable.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw) endif() add_simulation_test(IDF_FILE QTFtest.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw) add_simulation_test(IDF_FILE RadHiTempElecTermReheat.idf EPW_FILE USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.epw) diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt index 20eca9fdfb2..87e58097852 100644 --- a/third_party/CMakeLists.txt +++ b/third_party/CMakeLists.txt @@ -2,7 +2,6 @@ # add_library( ModernJSON INTERFACE ) # target_include_directories( ModernJSON INTERFACE "${PROJECT_SOURCE_DIR}/nlohmann" "${PROJECT_SOURCE_DIR}/doj" ) - # To avoid modifying every third_party library # we link the project_options in here for every library in this # subdirectory @@ -16,32 +15,44 @@ mark_as_advanced(FORCE JSONCPP_WITH_EXAMPLE) mark_as_advanced(FORCE JSONCPP_WITH_PKGCONFIG_SUPPORT) mark_as_advanced(FORCE JSONCPP_WITH_STRICT_ISO) mark_as_advanced(FORCE JSONCPP_WITH_TESTS) -set(JSONCPP_WITH_TESTS OFF CACHE BOOL "Compile and (for jsoncpp_check) run JsonCpp test executables" FORCE) +set(JSONCPP_WITH_TESTS + OFF + CACHE BOOL "Compile and (for jsoncpp_check) run JsonCpp test executables" FORCE) mark_as_advanced(FORCE JSONCPP_WITH_WARNING_AS_ERROR) mark_as_advanced(FORCE DEBUG_LIBNAME_SUFFIX) mark_as_advanced(FORCE JSONCPP_WITH_POST_BUILD_UNITTEST) -set(JSONCPP_WITH_POST_BUILD_UNITTEST OFF CACHE BOOL "Automatically run unit-tests as a post build step" FORCE) +set(JSONCPP_WITH_POST_BUILD_UNITTEST + OFF + CACHE BOOL "Automatically run unit-tests as a post build step" FORCE) mark_as_advanced(FORCE CCACHE_FOUND) -set(SAM_SKIP_TOOLS ON CACHE BOOL "Skips the sdktool and tcsconsole builds" FORCE) +set(SAM_SKIP_TOOLS + ON + CACHE BOOL "Skips the sdktool and tcsconsole builds" FORCE) mark_as_advanced(FORCE SAM_SKIP_TOOLS) -set(SAM_SKIP_TESTS ON CACHE BOOL "Skips building tests" FORCE) +set(SAM_SKIP_TESTS + ON + CACHE BOOL "Skips building tests" FORCE) mark_as_advanced(FORCE SAM_SKIP_TESTS) -set(SAMAPI_EXPORT OFF CACHE BOOL "Export of ssc binaries to the SAM_api directory; for Unix, compile ssc libraries for SAM_api" FORCE) +set(SAMAPI_EXPORT + OFF + CACHE BOOL "Export of ssc binaries to the SAM_api directory; for Unix, compile ssc libraries for SAM_api" FORCE) mark_as_advanced(FORCE SAMAPI_EXPORT) -ADD_SUBDIRECTORY(ssc) +add_subdirectory(ssc) set_target_properties(ssc PROPERTIES FOLDER ThirdParty/ssc) set_target_properties(shared PROPERTIES FOLDER ThirdParty/ssc) set_target_properties(splinter PROPERTIES FOLDER ThirdParty/ssc) -IF ( CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang" ) # g++/Clang +if(CMAKE_COMPILER_IS_GNUCXX + OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" + OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang") # g++/Clang target_compile_options(splinter PRIVATE -Wno-error -w) target_compile_options(shared PRIVATE -Wno-error -w) target_compile_options(ssc PRIVATE -Wno-error -w) -ELSEIF( MSVC ) # VisualStudio +elseif(MSVC) # VisualStudio target_compile_options(splinter PRIVATE /W0) target_compile_options(shared PRIVATE /W0 /wd4244) target_compile_options(ssc PRIVATE /W0) -ENDIF() +endif() target_compile_features(ssc PRIVATE cxx_std_11) # C++17 flag is intentionally after ssd @@ -50,10 +61,10 @@ set(CMAKE_CXX_STANDARD 17) #Note: the Tarcog files are improperly initializing their virtual base classes, and this 4589 warning # on MSVC is legitimate, but silencing the warning because it's a third-party library -if (NOT MSVC) +if(NOT MSVC) add_compile_options(-Wno-pedantic -Wno-unused-parameter -Wno-unknown-pragmas) else() - add_compile_options(/wd4267 /wd4996 /wd4068 /wd4244 /wd4589 ) + add_compile_options(/wd4267 /wd4996 /wd4068 /wd4244 /wd4589) endif() set(INSTALL_GTEST CACHE BOOL OFF) @@ -97,7 +108,6 @@ if(BUILD_TESTING) set_target_properties(gmock_main PROPERTIES FOLDER ThirdParty/gtest) endif() - add_subdirectory(ObjexxFCL) set_target_properties(objexx PROPERTIES FOLDER ThirdParty/ObjexxFCL) add_subdirectory(BCVTB) @@ -115,16 +125,14 @@ set_target_properties(re2 PROPERTIES FOLDER ThirdParty/re2) add_subdirectory(fmt-6.1.2) set_target_properties(fmt PROPERTIES FOLDER ThirdParty/fmt) - # Kiva include(cmake/kiva.cmake) set_target_properties(libkiva PROPERTIES FOLDER ThirdParty/Kiva) - if(NOT APPLE) add_subdirectory(FMUParser) set_target_properties(parser PROPERTIES FOLDER ThirdParty/FMI) - if (NOT MSVC) + if(NOT MSVC) target_compile_options(parser PRIVATE -Wno-switch) endif() endif() @@ -132,7 +140,6 @@ endif() add_subdirectory(Windows-CalcEngine) set_target_properties(Windows-CalcEngine PROPERTIES FOLDER ThirdParty/Windows-CalcEngine) - # Btwxt include_directories(${gtest_SOURCE_DIR}/include/ SYSTEM) set(BUILD_BTWXT_TESTING @@ -149,6 +156,3 @@ if(OPENGL_FOUND) set_target_properties(penumbra PROPERTIES FOLDER ThirdParty/Penumbra) set_target_properties(tess2 PROPERTIES FOLDER ThirdParty/Penumbra) endif() - - - diff --git a/tst/EnergyPlus/unit/CMakeLists.txt b/tst/EnergyPlus/unit/CMakeLists.txt index 91266bad1b8..54d4eadea8f 100644 --- a/tst/EnergyPlus/unit/CMakeLists.txt +++ b/tst/EnergyPlus/unit/CMakeLists.txt @@ -251,7 +251,7 @@ if(LINK_WITH_PYTHON) add_definitions("-DLINK_WITH_PYTHON") find_package(PythonLibs 3 REQUIRED) include_directories(${PYTHON_INCLUDE_DIRS}) - if (CMAKE_HOST_UNIX) + if(CMAKE_HOST_UNIX) list(APPEND test_src api/datatransfer.unit.cc) list(APPEND test_src PluginManager.unit.cc) list(APPEND test_dependencies ${PYTHON_LIBRARIES})