BUG: Fixed CMAKE_FIND_LIBRARY_PREFIXES related error on Win32 systems.
This commit is contained in:
parent
de25f5d131
commit
fce34113e0
|
@ -38,7 +38,7 @@ SET(RTI_POSSIBLE_DIRS
|
||||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MAK Technologies\\MAK RTI 2.2;Location]"
|
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\MAK Technologies\\MAK RTI 2.2;Location]"
|
||||||
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\MAK RTI 2.2;InstallLocation]")
|
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\MAK RTI 2.2;InstallLocation]")
|
||||||
|
|
||||||
SET(RTI_OLD_FIND_LIBRARY_PREFIXES ${CMAKE_FIND_LIBRARY_PREFIXES})
|
SET(RTI_OLD_FIND_LIBRARY_PREFIXES "${CMAKE_FIND_LIBRARY_PREFIXES}")
|
||||||
# The MAK RTI has the "lib" prefix even on Windows.
|
# The MAK RTI has the "lib" prefix even on Windows.
|
||||||
SET(CMAKE_FIND_LIBRARY_PREFIXES "lib" "")
|
SET(CMAKE_FIND_LIBRARY_PREFIXES "lib" "")
|
||||||
|
|
||||||
|
@ -79,7 +79,7 @@ ELSE (RTI_INCLUDE_DIR)
|
||||||
ENDIF (RTI_INCLUDE_DIR)
|
ENDIF (RTI_INCLUDE_DIR)
|
||||||
|
|
||||||
# Set the modified system variables back to the original value.
|
# Set the modified system variables back to the original value.
|
||||||
SET(CMAKE_FIND_LIBRARY_PREFIXES ${RTI_OLD_FIND_LIBRARY_PREFIXES})
|
SET(CMAKE_FIND_LIBRARY_PREFIXES "${RTI_OLD_FIND_LIBRARY_PREFIXES}")
|
||||||
|
|
||||||
INCLUDE(FindPackageHandleStandardArgs)
|
INCLUDE(FindPackageHandleStandardArgs)
|
||||||
FIND_PACKAGE_HANDLE_STANDARD_ARGS(RTI DEFAULT_MSG
|
FIND_PACKAGE_HANDLE_STANDARD_ARGS(RTI DEFAULT_MSG
|
||||||
|
|
Loading…
Reference in New Issue