diff --git a/cmake/EnergyPlus.cmake b/cmake/EnergyPlus.cmake index 9323a83d7..b7e8c1c67 100644 --- a/cmake/EnergyPlus.cmake +++ b/cmake/EnergyPlus.cmake @@ -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 diff --git a/fmu/fmu.hpp b/fmu/fmu.hpp index 93d5ef78b..351ebd36e 100644 --- a/fmu/fmu.hpp +++ b/fmu/fmu.hpp @@ -118,11 +118,11 @@ class FMU { const auto libFilename = fmi_lib_filename(modelIdentifier()); - std::vector possiblePaths{m_unzipped.outputDir() / spawn_fs::path{"binaries"} / fmi_platform() / + const std::vector 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; }