[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[certi-cvs] applications/XPlaneHLAPlugin CMakeLists.txt
From: |
certi-cvs |
Subject: |
[certi-cvs] applications/XPlaneHLAPlugin CMakeLists.txt |
Date: |
Tue, 15 Dec 2009 10:23:24 +0000 |
CVSROOT: /sources/certi
Module name: applications
Changes by: Petr Gotthard <gotthardp> 09/12/15 10:23:24
Modified files:
XPlaneHLAPlugin: CMakeLists.txt
Log message:
bug #26818: make the X-Plane plug-in less CERTI specific
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/applications/XPlaneHLAPlugin/CMakeLists.txt?cvsroot=certi&r1=1.6&r2=1.7
Patches:
Index: CMakeLists.txt
===================================================================
RCS file: /sources/certi/applications/XPlaneHLAPlugin/CMakeLists.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- CMakeLists.txt 15 Dec 2009 09:49:25 -0000 1.6
+++ CMakeLists.txt 15 Dec 2009 10:23:24 -0000 1.7
@@ -10,10 +10,12 @@
# CERTI requires CMake 2.4.x
CMAKE_MINIMUM_REQUIRED(VERSION 2.4.4)
-# Use CERTI specific CMake modules first
-# You should set CERTI_HOME env var to appropriate value or put here the full
path to the directory containing FindCERTI.cmake
-FILE(TO_CMAKE_PATH "$ENV{CERTI_HOME}" CERTI_PATH_HOME)
-LIST(APPEND CMAKE_MODULE_PATH ${CERTI_PATH_HOME}/share/scripts)
+# Detect the CERTI installation, http://www.cert.fr/CERTI
+IF ("$ENV{CERTI_HOME}" STRGREATER "")
+ # note: the CERTI_PATH_HOME is used to install the .fed file
+ FILE(TO_CMAKE_PATH "$ENV{CERTI_HOME}" CERTI_PATH_HOME)
+ LIST(APPEND CMAKE_MODULE_PATH ${CERTI_PATH_HOME}/share/scripts)
+ENDIF()
# You should uncomment the following line if you want VERBOSE build
#SET(CMAKE_VERBOSE_MAKEFILE ON)
@@ -46,8 +48,10 @@
MESSAGE(STATUS "Configuring ${PACKAGE_NAME} version ${PACKAGE_VERSION}")
#########################################################################
-# Call i.e. INCLUDE the CERTI usage configuration
+# Call i.e. INCLUDE the HLA RTI usage configuration
#########################################################################
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6.3)
+# The FindRTI.cmake module is available since cmake 2.6.3
FIND_PACKAGE(RTI REQUIRED)
INCLUDE_DIRECTORIES(${RTI_INCLUDE_DIR})
ADD_DEFINITIONS(${RTI_DEFINITIONS})
@@ -55,7 +59,7 @@
#########################################################################
# CPack specific Configuration
#########################################################################
-SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "XPlane Federation using CERTI")
+SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "XPlane Federation using M&S HLA")
SET(CPACK_PACKAGE_VENDOR "ONERA, CT/TIS, JMMathé")
SET(CPACK_PACKAGE_DESCRIPTION_FILE
"${CMAKE_CURRENT_SOURCE_DIR}/XPlane_DESCRIPTION.txt")
SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [certi-cvs] applications/XPlaneHLAPlugin CMakeLists.txt,
certi-cvs <=