[certi-cvs] applications F90HLA/demoF90/CMakeLists.txt F90H...

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    applications
Changes by:     Christian Stenzel <approx>      08/12/12 09:56:42

Modified files:
        F90HLA/demoF90 : CMakeLists.txt 
        F90HLA/libF90HLA13: CMakeLists.txt 
        MatlabHLA_Toolbox: Makefile 

Log message:
        Adapted lib dependencies, libCERTI->libRTI-NG, libFedtime

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/applications/F90HLA/demoF90/CMakeLists.txt?cvsroot=certi&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/applications/F90HLA/libF90HLA13/CMakeLists.txt?cvsroot=certi&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/applications/MatlabHLA_Toolbox/Makefile?cvsroot=certi&r1=1.1&r2=1.2

Patches:
Index: F90HLA/demoF90/CMakeLists.txt
===================================================================
RCS file: /sources/certi/applications/F90HLA/demoF90/CMakeLists.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- F90HLA/demoF90/CMakeLists.txt       28 Jan 2008 21:44:29 -0000      1.1
+++ F90HLA/demoF90/CMakeLists.txt       12 Dec 2008 09:56:41 -0000      1.2
@@ -25,6 +25,10 @@
 # CERTI requires CMake 2.4.x
 CMAKE_MINIMUM_REQUIRED(VERSION 2.4.4)
 
+# You should uncomment the following line
+# if you want VERBOSE build
+#SET(CMAKE_VERBOSE_MAKEFILE OFF)
+
 EXEC_PROGRAM(rm ARGS constantsMod.mod.proxy
                     fedSrvMod.mod.proxy
                     rtiSrvMod.mod.proxy)

Index: F90HLA/libF90HLA13/CMakeLists.txt
===================================================================
RCS file: /sources/certi/applications/F90HLA/libF90HLA13/CMakeLists.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- F90HLA/libF90HLA13/CMakeLists.txt   28 Jan 2008 21:44:30 -0000      1.1
+++ F90HLA/libF90HLA13/CMakeLists.txt   12 Dec 2008 09:56:42 -0000      1.2
@@ -60,15 +60,17 @@
 SET(PACKAGE_NAME      ${CMAKE_PROJECT_NAME})
 SET(PACKAGE_VERSION_MAJOR "0")
 SET(PACKAGE_VERSION_MINOR "1")
-SET(PACKAGE_VERSION_PATCH "0")
+SET(PACKAGE_VERSION_PATCH "1")
 SET(PACKAGE_VERSION   
"${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}.${PACKAGE_VERSION_PATCH}")
-SET(PACKAGE_BUGREPORT "address@hidden")
+SET(PACKAGE_BUGREPORT "address@hidden")
 MESSAGE(STATUS "Configuring ${PACKAGE_NAME} version ${PACKAGE_VERSION}")
 
 #########################################################################
-# Call i.e. INCLUDE the CERTI usage configuration
+# FIND RTI (CERTI, MAK, Pitch, ...)
 #########################################################################
-INCLUDE(UseCERTI)
+FIND_PACKAGE(RTI REQUIRED)
+INCLUDE_DIRECTORIES(${RTI_INCLUDE_DIR})
+ADD_DEFINITIONS(${RTI_DEFINITIONS})
 
 #########################################################################
 # CPack specific Configuration
@@ -106,7 +108,7 @@
 # Generic CMake library target
 ###################################
 ADD_LIBRARY(${LIB_NAME} ${SRC_LIST})
-TARGET_LINK_LIBRARIES (${LIB_NAME} ${CERTI_LIBRARIES})
+TARGET_LINK_LIBRARIES (${LIB_NAME} ${RTI_LIBRARIES})
 INSTALL(TARGETS ${LIB_NAME} 
         LIBRARY DESTINATION lib)
 

Index: MatlabHLA_Toolbox/Makefile
===================================================================
RCS file: /sources/certi/applications/MatlabHLA_Toolbox/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- MatlabHLA_Toolbox/Makefile  28 Jan 2008 21:46:20 -0000      1.1
+++ MatlabHLA_Toolbox/Makefile  12 Dec 2008 09:56:42 -0000      1.2
@@ -29,7 +29,7 @@
 all: ${BINS}
 
 rti.${MEXSUFFIX}: rti/rti.cpp
-       mex ${FLAGS} -o $@ $^ -lRTI
+       mex ${FLAGS} -o $@ $^ -lRTI-NG
 
 install:
        mkdir ./${TARGETDIR}; \