Fix for #38: use CMAKE_INSTALL_PREFIX #40
Conversation
SimTK_INSTALL_PREFIX was previously used for specifying the install prefix and CMAKE_INSTALL_PREFIX. This commit changes to use CMAKE_INSTALL_PREFIX instead.
|
Thanks, Steve! Travis grabbed this and built it successfully on Ubuntu with both gcc and clang. I will try it on Windows. OK, I tried this on 64 bit Windows 7 building 32 bit and 64 bit Simbody with Visual Studio 10. CMake 2.8.10.2 managed to correctly initialize |
|
The Travis test is not sufficient, because it doesn't do an install. It builds and runs the tests right in the source tree. I'll try on my Ubuntu machine. |
| "Install path prefix." FORCE) | ||
| mark_as_advanced(CMAKE_INSTALL_PREFIX) | ||
| ENDIF() | ||
| ENDIF() |
There was a problem hiding this comment.
I'm not sure that this section is actually working. The intent was to allow cmake .. -DSimTK_INSTALL_PREFIX=${PREFIX}, but I think it's not working.
There was a problem hiding this comment.
Yeah, I think that is because CMAKE_INSTALL_PREFIX is always set. It might work if you erased it with something like cmake -DCMAKE_INSTALL_PREFIX= -DSimTK_INSTALL_PREFIX=${PREFIX}
Still, I'm having trouble thinking of any reason why we need to continue supporting SimTK_INSTALL_PREFIX.
Fix the use of SimTK_INSTALL_PREFIX for backward compatibility.
|
I just pushed a fix for the old-style -DSimTK_INSTALL_PREFIX option if CMAKE_INSTALL_PREFIX isn't set. |
|
A) As is, the description for CMAKE_INSTALL_PREFIX is either "Install path prefix." or "Install directory." Could this be made consistent? B) By default, I did not have a SimTK_INSTALL_DIR variable, and CMAKE_INSTALL_PREFIX was set to C) The backwards compatibility section checks to see if CMAKE_INSTALL_PREFIX is set or not; doesn't CMake set this by default? If so, this would always be false. I didn't try actually using the library in its installed form; I just made sure there were no issues when running EDIT: I did my build/install before @scpeters added 7023a2b to the PR. |
|
No, I didn’t change anything there. It is attempting to turn off certain gcc optimizations that were buggy in gcc 4.4.3. But I see that the check is being done without checking whether the compiler is gcc or clang. What it calls |
|
I also pushed this to the master branch. |
Except for the root CMakeLists.txt, it's a search and replace of SimTK_INSTALL_PREFIX to CMAKE_INSTALL_PREFIX. For the root CMakeLists.txt, I remove the block of code that overwrites CMAKE_INSTALL_PREFIX with the value of SimTK_INSTALL_PREFIX, and add a different block that will copy SimTK_INSTALL_PREFIX into CMAKE_INSTALL_PREFIX under certain conditions for backward compatibility.
I have tested this on OSX, but I still need to test on my Ubuntu machine. If someone can test this on Windows I would appreciate it.