[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[certi-cvs] certi/scripts FindRTI.cmake
From: |
certi-cvs |
Subject: |
[certi-cvs] certi/scripts FindRTI.cmake |
Date: |
Sat, 23 Jan 2010 19:05:31 +0000 |
CVSROOT: /sources/certi
Module name: certi
Changes by: Petr Gotthard <gotthardp> 10/01/23 19:05:31
Modified files:
scripts : FindRTI.cmake
Log message:
Bugfix of the previous commit.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/scripts/FindRTI.cmake?cvsroot=certi&r1=1.10&r2=1.11
Patches:
Index: FindRTI.cmake
===================================================================
RCS file: /sources/certi/certi/scripts/FindRTI.cmake,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- FindRTI.cmake 23 Jan 2010 11:24:04 -0000 1.10
+++ FindRTI.cmake 23 Jan 2010 19:05:31 -0000 1.11
@@ -23,11 +23,15 @@
ENDIF(NOT ${QUIET})
ENDMACRO(RTI_MESSAGE_QUIETLY QUIET TYPE MSG)
-# Detect the CERTI installation, http://www.cert.fr/CERTI
-IF ("$ENV{CERTI_HOME}" STRGREATER "")
+IF(NOT RTI_PATH)
+ # Detect the CERTI installation, http://www.cert.fr/CERTI
+ IF ("$ENV{CERTI_HOME}" STRGREATER "")
FILE(TO_CMAKE_PATH "$ENV{CERTI_HOME}" RTI_PATH)
RTI_MESSAGE_QUIETLY(RTI_FIND_QUIETLY STATUS "Using environment defined
CERTI_HOME: ${RTI_PATH}")
-ENDIF ("$ENV{CERTI_HOME}" STRGREATER "")
+ ENDIF ("$ENV{CERTI_HOME}" STRGREATER "")
+
+ SET(RTI_PATH ${RTI_PATH} CACHE PATH "The HLA RTI directory root.")
+ENDIF(NOT RTI_PATH)
SET(RTI_DEFINITIONS "-DRTI_USES_STD_FSTREAM")
@@ -64,7 +68,7 @@
IF(${VAR_RELEASELIB})
SET(${VAR_LIBRARIES} ${${VAR_RELEASELIB}})
RTI_MESSAGE_QUIETLY(RTI_FIND_QUIETLY STATUS "${MESSAGE} found:
${${VAR_RELEASELIB}}")
- ELIF(${VAR_DEBUGLIB})
+ ELSEIF(${VAR_DEBUGLIB})
SET(${VAR_LIBRARIES} ${${VAR_DEBUGLIB}})
RTI_MESSAGE_QUIETLY(RTI_FIND_QUIETLY STATUS "${MESSAGE} found:
${${VAR_DEBUGLIB}}")
ELSE(${VAR_RELEASELIB})
@@ -138,4 +142,4 @@
SET(RTI_LIBRARIES
${RTI_LIBRARIES} ${RTI_FEDTIME_LIBRARIES})
-# $Id: FindRTI.cmake,v 1.10 2010/01/23 11:24:04 gotthardp Exp $
+# $Id: FindRTI.cmake,v 1.11 2010/01/23 19:05:31 gotthardp Exp $
- [certi-cvs] certi/scripts FindRTI.cmake,
certi-cvs <=