Skip to content

Commit

Permalink
Updating Pat also #1665
Browse files Browse the repository at this point in the history
  • Loading branch information
@axelstudios
axelstudios committed Jun 2, 2015
1 parent ea253d0 commit 24e09a7
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 6 deletions.
3 changes: 2 additions & 1 deletion openstudiocore/src/openstudio_app/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,8 @@ if(APPLE)
\"${CMAKE_BINARY_DIR}/Products/ruby/openstudioutilitiesplot.bundle\"
\"${CMAKE_BINARY_DIR}/Products/ruby/openstudioutilitiessql.bundle\"
\"${CMAKE_BINARY_DIR}/Products/ruby/openstudioutilitiestime.bundle\"
\"${CMAKE_BINARY_DIR}/Products/ruby/openstudioutilitiesunits.bundle\")
\"${CMAKE_BINARY_DIR}/Products/ruby/openstudioutilitiesunits.bundle\"
)
file(COPY \${PLUGINS} DESTINATION \"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}\")
Expand Down
41 changes: 36 additions & 5 deletions openstudiocore/src/pat_app/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -413,11 +413,42 @@ endif()
if(APPLE)
install(CODE "
file(GLOB_RECURSE PLUGINS
\"${CMAKE_BINARY_DIR}/Products/ruby/openstudioutilities*.bundle\"
\"${CMAKE_BINARY_DIR}/Products/ruby/openstudiomodel*.bundle\"
\"${CMAKE_BINARY_DIR}/Products/ruby/openstudioenergyplus*.bundle\"
\"${CMAKE_BINARY_DIR}/Products/ruby/openstudioruleset.bundle\"
file(GLOB_RECURSE PLUGINS
\"${CMAKE_BINARY_DIR}/Products/ruby/openstudioairflow.bundle\"
\"${CMAKE_BINARY_DIR}/Products/ruby/openstudioanalysis.bundle\"
\"${CMAKE_BINARY_DIR}/Products/ruby/openstudioanalysisdriver.bundle\"
\"${CMAKE_BINARY_DIR}/Products/ruby/openstudioenergyplus.bundle\"
\"${CMAKE_BINARY_DIR}/Products/ruby/openstudiogbxml.bundle\"
\"${CMAKE_BINARY_DIR}/Products/ruby/openstudioisomodel.bundle\"
\"${CMAKE_BINARY_DIR}/Products/ruby/openstudiolib.bundle\"
\"${CMAKE_BINARY_DIR}/Products/ruby/openstudiomodel.bundle\"
\"${CMAKE_BINARY_DIR}/Products/ruby/openstudiomodelcore.bundle\"
\"${CMAKE_BINARY_DIR}/Products/ruby/openstudiomodeleditor.bundle\"
\"${CMAKE_BINARY_DIR}/Products/ruby/openstudiomodelgeometry.bundle\"
\"${CMAKE_BINARY_DIR}/Products/ruby/openstudiomodelhvac.bundle\"
\"${CMAKE_BINARY_DIR}/Products/ruby/openstudiomodelrefrigeration.bundle\"
\"${CMAKE_BINARY_DIR}/Products/ruby/openstudiomodelresources.bundle\"
\"${CMAKE_BINARY_DIR}/Products/ruby/openstudiomodelsimulation.bundle\"
\"${CMAKE_BINARY_DIR}/Products/ruby/openstudioosversion.bundle\"
\"${CMAKE_BINARY_DIR}/Products/ruby/openstudioproject.bundle\"
\"${CMAKE_BINARY_DIR}/Products/ruby/openstudioradiance.bundle\"
\"${CMAKE_BINARY_DIR}/Products/ruby/openstudioruleset.bundle\"
\"${CMAKE_BINARY_DIR}/Products/ruby/openstudiorunmanager.bundle\"
\"${CMAKE_BINARY_DIR}/Products/ruby/openstudiosdd.bundle\"
\"${CMAKE_BINARY_DIR}/Products/ruby/openstudioutilities.bundle\"
\"${CMAKE_BINARY_DIR}/Products/ruby/openstudioutilitiesbcl.bundle\"
\"${CMAKE_BINARY_DIR}/Products/ruby/openstudioutilitiescloud.bundle\"
\"${CMAKE_BINARY_DIR}/Products/ruby/openstudioutilitiescore.bundle\"
\"${CMAKE_BINARY_DIR}/Products/ruby/openstudioutilitiesdata.bundle\"
\"${CMAKE_BINARY_DIR}/Products/ruby/openstudioutilitieseconomics.bundle\"
\"${CMAKE_BINARY_DIR}/Products/ruby/openstudioutilitiesfiletypes.bundle\"
\"${CMAKE_BINARY_DIR}/Products/ruby/openstudioutilitiesgeometry.bundle\"
\"${CMAKE_BINARY_DIR}/Products/ruby/openstudioutilitiesidd.bundle\"
\"${CMAKE_BINARY_DIR}/Products/ruby/openstudioutilitiesidf.bundle\"
\"${CMAKE_BINARY_DIR}/Products/ruby/openstudioutilitiesplot.bundle\"
\"${CMAKE_BINARY_DIR}/Products/ruby/openstudioutilitiessql.bundle\"
\"${CMAKE_BINARY_DIR}/Products/ruby/openstudioutilitiestime.bundle\"
\"${CMAKE_BINARY_DIR}/Products/ruby/openstudioutilitiesunits.bundle\"
)
file(COPY \${PLUGINS} DESTINATION \"\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}\")
Expand Down

8 comments on commit 24e09a7

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

develop (axelstudios) - x86_64-MacOS-10.9-clang: Tests Failed

Build Badge Test Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

develop (axelstudios) - x86_64-Linux-Ubuntu-14.04-clang-3.5: OK (2129 of 2213 tests passed)

Build Badge Test Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

develop (axelstudios) - x86_64-Linux-Ubuntu-14.04-cppcheck-1.61: OK (0 of 0 tests passed)

Build Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

iteration (axelstudios) - i386-Windows-7-VisualStudio-12: OK (2186 of 2213 tests passed)

Build Badge Test Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

iteration (axelstudios) - Win64-Windows-7-VisualStudio-12: OK (2186 of 2213 tests passed)

Build Badge Test Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

iteration (axelstudios) - x86_64-MacOS-10.9-clang: Tests Failed

Build Badge Test Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

iteration (axelstudios) - x86_64-Linux-Ubuntu-14.04-clang-3.5: OK (2155 of 2213 tests passed)

Build Badge Test Badge

@nrel-bot
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

iteration (axelstudios) - x86_64-Linux-Ubuntu-14.04-cppcheck-1.61: OK (0 of 0 tests passed)

Build Badge

Please sign in to comment.