(FACT-1294) Use relative path in facter.rb #1291
Conversation
|
This requires a change to puppet-agent builds on Windows to set the CMAKE_INSTALL_PREFIX appropriately. |
Change `facter.rb` to always use a relative path to find libfacter, based on the relative path of the install location of facter.rb and CMAKE_INSTALL_PREFIX. This fixes libfacter lookup when doing `make install` on a Windows machine, and removes hard-coding the MSI layout.
| @@ -343,6 +338,12 @@ else() | |||
| endif() | |||
|
|
|||
| if(RUBY_VENDORDIR) | |||
| file(RELATIVE_PATH LIBFACTER_INSTALL_RELATIVE ${RUBY_VENDORDIR} ${CMAKE_INSTALL_PREFIX}) | |||
There was a problem hiding this comment.
Do you need to quote RUBY_VENDORDIR and CMAKE_INSTALL_PREFIX here? I can never remember how exactly CMake behaves with variable expansion at function call sites
There was a problem hiding this comment.
We didn't other places, so I was hoping not. I'll try a run installing to "C:/Program Files" just to be sure.
There was a problem hiding this comment.
Testing "C:/Program Files" worked fine.
|
Did Windows and el-7 builds, both look good. |
|
👍 |
|
PA-252 was merged, this should be ready to go. |
(FACT-1294) Use relative path in facter.rb
Change
facter.rbto always use a relative path to find libfacter, basedon the relative path of the install location of facter.rb and
CMAKE_INSTALL_PREFIX. This fixes libfacter lookup when doing
make installon a Windows machine, and removes hard-coding the MSI layout.