projects / packages / cmake.git / blame
| Commit | Line | Data |
|---|---|---|
| fe667d6f ER |
1 | commit 1d798ab1d961a075c1391fd20b49940b05af07bb |
| 2 | Author: Orion Poplawski <orion@nwra.com> | |
| 3 | Date: Wed Oct 24 19:54:09 2012 -0600 | |
| 4 | ||
| 5 | Update to 2.8.10 RC 3 | |
| 6 | Rebase FindRuby and FindPostgreSQL patches | |
| 7 | ||
| 8 | commit 0cf590138b7671c505d4d2800f85eabb40d175d7 | |
| 9 | Author: Orion Poplawski <orion@cora.nwra.com> | |
| 10 | Date: Mon May 21 10:39:01 2012 -0600 | |
| 11 | ||
| 12 | Add patch to fix FindRuby (bug 822796) | |
| 13 | diff -up cmake-2.8.10-rc1/Modules/FindRuby.cmake.findruby cmake-2.8.10-rc1/Modules/FindRuby.cmake | |
| 14 | --- cmake-2.8.10-rc1/Modules/FindRuby.cmake.findruby 2012-10-02 10:12:18.000000000 -0600 | |
| 15 | +++ cmake-2.8.10-rc1/Modules/FindRuby.cmake 2012-10-02 15:50:30.463292214 -0600 | |
| 16 | @@ -92,14 +92,8 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSIO | |
| 17 | _RUBY_CONFIG_VAR("sitearchdir" RUBY_SITEARCH_DIR) | |
| 18 | _RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR) | |
| 19 | ||
| 20 | - # vendor_ruby available ? | |
| 21 | - execute_process(COMMAND ${RUBY_EXECUTABLE} -r vendor-specific -e "print 'true'" | |
| 22 | - OUTPUT_VARIABLE RUBY_HAS_VENDOR_RUBY ERROR_QUIET) | |
| 23 | - | |
| 24 | - if(RUBY_HAS_VENDOR_RUBY) | |
| 25 | - _RUBY_CONFIG_VAR("vendorlibdir" RUBY_VENDORLIB_DIR) | |
| 26 | - _RUBY_CONFIG_VAR("vendorarchdir" RUBY_VENDORARCH_DIR) | |
| 27 | - endif() | |
| 28 | + _RUBY_CONFIG_VAR("vendorlibdir" RUBY_VENDORLIB_DIR) | |
| 29 | + _RUBY_CONFIG_VAR("vendorarchdir" RUBY_VENDORARCH_DIR) | |
| 30 | ||
| 31 | # save the results in the cache so we don't have to run ruby the next time again | |
| 32 | set(RUBY_VERSION_MAJOR ${RUBY_VERSION_MAJOR} CACHE PATH "The Ruby major version" FORCE) |