Merge remote-tracking branch 'remotes/upstream/develop' into 59295112…

…-Ruby2_0_Sketchup
sasobadovinac · Dec 11, 2013 · 49e08f6 · 49e08f6
2 parents 8af29f8 + 33ddd99
commit 49e08f6
Show file tree

Hide file tree

Showing 79 changed files with 10,793 additions and 419 deletions.
diff --git a/openstudiocore/CMakeLists.txt b/openstudiocore/CMakeLists.txt
@@ -66,7 +66,7 @@ OPTION( ENABLE_TEST_RUNNER_TARGETS "Create test runner targets" OFF )
 
 # Build with OpenSSL support
 SET( BUILD_WITH_OPENSSL ON CACHE INTERNAL "Build With OpenSSL Support For SSH Connections" )
-
+
 # Build R package
 OPTION( BUILD_R "Build R package" OFF )
 
@@ -912,18 +912,7 @@ IF (NOT UNIX)
 
   install( DIRECTORY "${CMAKE_BINARY_DIR}/strawberry-perl-5.16.2.1-32bit-portable-reduced" DESTINATION . )
 
-  execute_process(COMMAND ${CMAKE_COMMAND} -E remove_directory "${CMAKE_BINARY_DIR}/ruby-install")
-
-  execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/ruby-install"
-    RESULT_VARIABLE rv)
-
-  execute_process(COMMAND ${CMAKE_COMMAND} -E tar xfz "${CMAKE_SOURCE_DIR}/../dependencies/ruby-1.8.6-msvc.zip"
-    WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/ruby-install"
-    RESULT_VARIABLE rv)
-
-  file(COPY "${LIBEAY32_PATH}" "${SSLEAY32_PATH}" DESTINATION "${CMAKE_BINARY_DIR}/ruby-install/ruby/bin")
-
-  install( DIRECTORY "${CMAKE_BINARY_DIR}/ruby-install" DESTINATION . )
+  install( DIRECTORY "${CMAKE_BINARY_DIR}/../../../Ruby-prefix/src/Ruby/" DESTINATION "ruby-install/ruby" )
 
   SET(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP ON)
   INCLUDE(InstallRequiredSystemLibraries)