diff options
| author | Rolf Eike Beer <eike@sf-mail.de> | 2012-03-29 00:00:54 +0200 |
|---|---|---|
| committer | Rolf Eike Beer <eike@sf-mail.de> | 2012-08-14 21:02:58 +0200 |
| commit | b04650e163320353762b6ec196afa9500345b5cd (patch) | |
| tree | 1790b38ae7db75f232a27f4aa796d4441c68f009 /Modules/FindRTI.cmake | |
| parent | cd3bd23266a4a6c00595134a17a8bdaea9e28af5 (diff) | |
| download | cmake-b04650e163320353762b6ec196afa9500345b5cd.tar.gz | |
use the find_* functions ENV parameter
Instead of directly passing $ENV{SOMEVAR} to a find_* call pass in ENV SOMEVAR.
This will make sure the paths will get correctly handled through different
platforms, especially on Windows.
Also fixes one place where paths with windows delimiters (\) were hardcoded to
use forward slashes.
Diffstat (limited to 'Modules/FindRTI.cmake')
| -rw-r--r-- | Modules/FindRTI.cmake | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/Modules/FindRTI.cmake b/Modules/FindRTI.cmake index eef0daee9c..60990b767e 100644 --- a/Modules/FindRTI.cmake +++ b/Modules/FindRTI.cmake @@ -35,18 +35,13 @@ macro(RTI_MESSAGE_QUIETLY QUIET TYPE MSG) endif() endmacro() -# Detect the CERTI installation, http://www.cert.fr/CERTI -if ("$ENV{CERTI_HOME}" STRGREATER "") - file(TO_CMAKE_PATH "$ENV{CERTI_HOME}" CERTI_HOME) - RTI_MESSAGE_QUIETLY(RTI_FIND_QUIETLY STATUS "Using environment defined CERTI_HOME: ${CERTI_HOME}") -endif () - set(RTI_DEFINITIONS "-DRTI_USES_STD_FSTREAM") +# Detect the CERTI installation, http://www.cert.fr/CERTI # Detect the MAK Technologies RTI installation, http://www.mak.com/products/rti.php # note: the following list is ordered to find the most recent version first set(RTI_POSSIBLE_DIRS - ${CERTI_HOME} + ENV CERTI_HOME "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MAK Technologies\\MAK RTI 3.2 MSVC++ 8.0;Location]" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\MAK RTI 3.2-win32-msvc++8.0;InstallLocation]" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MAK Technologies\\MAK RTI 2.2;Location]" |