[certi-cvs] certi/scripts FindRTI.cmake

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Petr Gotthard <gotthardp>       08/09/24 17:00:17

Modified files:
        scripts        : FindRTI.cmake 

Log message:
        Improved based on Philip Lowman comments.
        This is a CMake 2.4 compatible version. The version sent to CMake is 
2.6 only.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/scripts/FindRTI.cmake?cvsroot=certi&r1=1.2&r2=1.3

Patches:
Index: FindRTI.cmake
===================================================================
RCS file: /sources/certi/certi/scripts/FindRTI.cmake,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- FindRTI.cmake       22 Sep 2008 07:37:00 -0000      1.2
+++ FindRTI.cmake       24 Sep 2008 17:00:17 -0000      1.3
@@ -8,94 +8,84 @@
 # http://en.wikipedia.org/wiki/Run-Time_Infrastructure_(simulation)
 #
 # This code sets the following variables:
-#  RTI_INCLUDE_DIRS = the directory(ies) where RTI includes file are found
+#  RTI_INCLUDE_DIR = the directory where RTI includes file are found
 #  RTI_LIBRARIES = The libraries to link against to use RTI
 #  RTI_DEFINITIONS = -DRTI_USES_STD_FSTREAM
-#  RTI_LIBRARY_DIRS = Set of library directories
 #  RTI_FOUND = Set to FALSE if any HLA RTI was not found
 #
 # Report problems to <address@hidden>
 
 INCLUDE(CMakeFindFrameworks)
 
-MACRO(MESSAGE_QUIETLY QUIET TYPE MSG)
+MACRO(RTI_MESSAGE_QUIETLY QUIET TYPE MSG)
   IF(NOT ${QUIET})
     MESSAGE(${TYPE} "${MSG}")
   ENDIF(NOT ${QUIET})
-ENDMACRO(MESSAGE_QUIETLY QUIET TYPE MSG)
+ENDMACRO(RTI_MESSAGE_QUIETLY QUIET TYPE MSG)
 
 # Detect the CERTI installation, http://www.cert.fr/CERTI
 IF ("$ENV{CERTI_HOME}" STRGREATER "")
   FILE(TO_CMAKE_PATH "$ENV{CERTI_HOME}" CERTI_HOME)
-  MESSAGE_QUIETLY(RTI_FIND_QUIETLY STATUS "Using environment defined 
CERTI_HOME: ${CERTI_HOME}")
+  RTI_MESSAGE_QUIETLY(RTI_FIND_QUIETLY STATUS "Using environment defined 
CERTI_HOME: ${CERTI_HOME}")
 ENDIF ("$ENV{CERTI_HOME}" STRGREATER "")
 
 SET(RTI_DEFINITIONS "-DRTI_USES_STD_FSTREAM")
 
 # Detect the MAK Technologies RTI installation, 
http://www.mak.com/products/rti.php
 # note: the following list is ordered to find first the most recent version
-SET(POSSIBLE_DIRS
+SET(RTI_POSSIBLE_DIRS
   ${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]"
-  
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\MAK
 RTI 2.2;InstallLocation]"
-  /usr
-  /usr/local)
+  
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\MAK
 RTI 2.2;InstallLocation]")
 
+# The MAK RTI has the "lib" prefix even on Windows.
 SET(CMAKE_FIND_LIBRARY_PREFIXES "lib" "")
 
 FIND_LIBRARY(RTI_LIBRARY
   NAMES RTI RTI-NG
-  PATHS ${POSSIBLE_DIRS}
+  PATHS ${RTI_POSSIBLE_DIRS}
   PATH_SUFFIXES lib
   DOC "The RTI Library")
 
 IF (RTI_LIBRARY)
   SET(RTI_LIBRARIES ${RTI_LIBRARY})
-  MESSAGE_QUIETLY(RTI_FIND_QUIETLY STATUS "RTI library found: ${RTI_LIBRARY}")
-  GET_FILENAME_COMPONENT(RTI_LIBRARY_DIRS ${RTI_LIBRARY} PATH)
+  RTI_MESSAGE_QUIETLY(RTI_FIND_QUIETLY STATUS "RTI library found: 
${RTI_LIBRARY}")
 ELSE (RTI_LIBRARY)
-  MESSAGE_QUIETLY(RTI_FIND_QUIETLY STATUS "RTI library NOT found")
+  RTI_MESSAGE_QUIETLY(RTI_FIND_QUIETLY STATUS "RTI library NOT found")
 ENDIF (RTI_LIBRARY)
 
-FIND_LIBRARY(FEDTIME_LIBRARY
+FIND_LIBRARY(RTI_FEDTIME_LIBRARY
   NAMES FedTime
-  PATHS ${POSSIBLE_DIRS}
+  PATHS ${RTI_POSSIBLE_DIRS}
   PATH_SUFFIXES lib
   DOC "The FedTime Library")
 
-IF (FEDTIME_LIBRARY)
-  SET(RTI_LIBRARIES ${RTI_LIBRARIES} ${FEDTIME_LIBRARY})
-  MESSAGE_QUIETLY(RTI_FIND_QUIETLY STATUS "RTI FedTime found: 
${FEDTIME_LIBRARY}")
-ENDIF (FEDTIME_LIBRARY)
+IF (RTI_FEDTIME_LIBRARY)
+  SET(RTI_LIBRARIES ${RTI_LIBRARIES} ${RTI_FEDTIME_LIBRARY})
+  RTI_MESSAGE_QUIETLY(RTI_FIND_QUIETLY STATUS "RTI FedTime found: 
${RTI_FEDTIME_LIBRARY}")
+ENDIF (RTI_FEDTIME_LIBRARY)
 
-FIND_FILE(RTI_INCLUDE
+FIND_PATH(RTI_INCLUDE_DIR
   NAMES RTI.hh
-  PATHS ${POSSIBLE_DIRS}
+  PATHS ${RTI_POSSIBLE_DIRS}
   PATH_SUFFIXES include
   DOC "The RTI Include Files")
 
-IF (RTI_INCLUDE)
-  MESSAGE_QUIETLY(RTI_FIND_QUIETLY STATUS "RTI headers found: ${RTI_INCLUDE}")
-  GET_FILENAME_COMPONENT(RTI_INCLUDE_DIRS ${RTI_INCLUDE} PATH)
-ELSE (RTI_INCLUDE)
-  MESSAGE_QUIETLY(RTI_FIND_QUIETLY STATUS "RTI headers NOT found")
-ENDIF (RTI_INCLUDE)
+IF (RTI_INCLUDE_DIR)
+  RTI_MESSAGE_QUIETLY(RTI_FIND_QUIETLY STATUS "RTI headers found: 
${RTI_INCLUDE_DIR}")
+ELSE (RTI_INCLUDE_DIR)
+  RTI_MESSAGE_QUIETLY(RTI_FIND_QUIETLY STATUS "RTI headers NOT found")
+ENDIF (RTI_INCLUDE_DIR)
 
-IF (RTI_LIBRARY AND RTI_INCLUDE)
+IF (RTI_LIBRARY AND RTI_INCLUDE_DIR)
   SET(RTI_FOUND TRUE)
-ELSE (RTI_LIBRARY AND RTI_INCLUDE)
+ELSE (RTI_LIBRARY AND RTI_INCLUDE_DIR)
   SET(RTI_FOUND FALSE)
   IF (RTI_FIND_REQUIRED)
     MESSAGE(FATAL_ERROR "No RTI found! Please install a HLA RTI and re-run.")
   ENDIF (RTI_FIND_REQUIRED)
-ENDIF(RTI_LIBRARY AND RTI_INCLUDE)
+ENDIF(RTI_LIBRARY AND RTI_INCLUDE_DIR)
 
-MARK_AS_ADVANCED(
-  RTI_LIBRARIES
-  RTI_INCLUDE_DIRS
-  RTI_DEFINITIONS
-  RTI_LIBRARY_DIRS)
-
-# $Id: FindRTI.cmake,v 1.2 2008/09/22 07:37:00 gotthardp Exp $
+# $Id: FindRTI.cmake,v 1.3 2008/09/24 17:00:17 gotthardp Exp $