Skip to content

Commit

Permalink
Fix compiler errors
Browse files Browse the repository at this point in the history
  • Loading branch information
kbenne committed Jul 5, 2024
1 parent 972749e commit c10e8c6
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion cmake/EnergyPlus.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ execute_process(COMMAND ${CMAKE_COMMAND}
-DPROJECT_BINARY_DIR=${PROJECT_BINARY_DIR}/energyplus
-DSpawn_SOURCE_DIR=${Spawn_SOURCE_DIR}
-P ${PROJECT_SOURCE_DIR}/cmake/create_energyplus_version.cmake)
include("${PROJECT_BINARY_DIR}/EnergyPlus/energyplus_version.cmake")
include("${PROJECT_BINARY_DIR}/energyplus/energyplus_version.cmake")

# EnergyPlus is forcing CPACK_BINARY_IFW on but for Spawn we aren't using IFW so
# reset to OFF
Expand Down
4 changes: 2 additions & 2 deletions fmu/fmu.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,11 @@ class FMU
{
const auto libFilename = fmi_lib_filename(modelIdentifier());

std::vector<spawn_fs::path> possiblePaths{m_unzipped.outputDir() / spawn_fs::path{"binaries"} / fmi_platform() /
const std::vector<spawn_fs::path> possiblePaths{m_unzipped.outputDir() / spawn_fs::path{"binaries"} / fmi_platform() /
libFilename,
m_unzipped.outputDir() / spawn_fs::path{"binaries"} / libFilename};

for (const auto p : possiblePaths) {
for (const auto &p : possiblePaths) {
if (spawn_fs::exists(p)) {
return p;
}
Expand Down

0 comments on commit c10e8c6

Please sign in to comment.