[certi-cvs] certi libHLA/CMakeLists.txt RTIG/CMakeLists.txt...

[CERTI CVS commits]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      11/12/18 16:02:23

Modified files:
        libHLA         : CMakeLists.txt 
        RTIG           : CMakeLists.txt 
        .              : CMakeLists.txt 
        libCERTI       : CMakeLists.txt 
        libRTI         : CMakeLists.txt 
        RTIA           : CMakeLists.txt 
Added files:
        .              : CERTIConfig.cmake.in 
                         CERTIConfigVersion.cmake.in 
                         CERTIBuildTreeSettings.cmake.in 

Log message:
        Add CMake's config mode file for CERTI

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libHLA/CMakeLists.txt?cvsroot=certi&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/certi/RTIG/CMakeLists.txt?cvsroot=certi&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/certi/CMakeLists.txt?cvsroot=certi&r1=1.111&r2=1.112
http://cvs.savannah.gnu.org/viewcvs/certi/CERTIConfig.cmake.in?cvsroot=certi&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/certi/CERTIConfigVersion.cmake.in?cvsroot=certi&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/certi/CERTIBuildTreeSettings.cmake.in?cvsroot=certi&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/certi/libCERTI/CMakeLists.txt?cvsroot=certi&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/CMakeLists.txt?cvsroot=certi&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/certi/RTIA/CMakeLists.txt?cvsroot=certi&r1=1.9&r2=1.10

Patches:
Index: libHLA/CMakeLists.txt
===================================================================
RCS file: /sources/certi/certi/libHLA/CMakeLists.txt,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- libHLA/CMakeLists.txt       18 Dec 2011 13:28:08 -0000      1.17
+++ libHLA/CMakeLists.txt       18 Dec 2011 16:02:22 -0000      1.18
@@ -142,7 +142,7 @@
     DESTINATION bin)
 
 INSTALL(TARGETS HLA
-    EXPORT certi-targets
+    EXPORT CERTIDepends
     RUNTIME DESTINATION bin
     LIBRARY DESTINATION lib
     ARCHIVE DESTINATION lib)

Index: RTIG/CMakeLists.txt
===================================================================
RCS file: /sources/certi/certi/RTIG/CMakeLists.txt,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- RTIG/CMakeLists.txt 28 Mar 2010 16:08:34 -0000      1.8
+++ RTIG/CMakeLists.txt 18 Dec 2011 16:02:22 -0000      1.9
@@ -17,6 +17,7 @@
 TARGET_LINK_LIBRARIES(rtig CERTI)
 
 INSTALL(TARGETS rtig 
+    EXPORT CERTIDepends
     RUNTIME DESTINATION bin
     LIBRARY DESTINATION lib
     ARCHIVE DESTINATION lib)

Index: CMakeLists.txt
===================================================================
RCS file: /sources/certi/certi/CMakeLists.txt,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -b -r1.111 -r1.112
--- CMakeLists.txt      18 Dec 2011 15:25:43 -0000      1.111
+++ CMakeLists.txt      18 Dec 2011 16:02:22 -0000      1.112
@@ -409,9 +409,6 @@
 ADD_SUBDIRECTORY( doc )
 ADD_SUBDIRECTORY( scripts )
 
-install(EXPORT certi-targets DESTINATION share/scripts)
-
-
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "CERTI An efficient Open Source HLA 
RunTime Infrastructure")
 SET(CPACK_PACKAGE_VENDOR "ONERA/DTIM")
 SET(CPACK_PACKAGE_CONTACT "address@hidden")
@@ -541,6 +538,27 @@
 
 ENABLE_TESTING()
 
+## Here comes the CERTI export things ##
+# Create a CERTIBuildTreeSettings.cmake file for the use from the build tree
+configure_file(CERTIBuildTreeSettings.cmake.in
+  "${PROJECT_BINARY_DIR}/CERTIBuildTreeSettings.cmake" @ONLY)
+
+#file(RELATIVE_PATH CONF_REL_INCLUDE_DIR "${INSTALL_CMAKE_DIR}"
+#   "${INSTALL_INCLUDE_DIR}")
+set(CONF_REL_INCLUDE_DIR "../../include")
+configure_file(CERTIConfig.cmake.in
+  "${PROJECT_BINARY_DIR}/CERTIConfig.cmake" @ONLY)
+configure_file(CERTIConfigVersion.cmake.in
+  "${PROJECT_BINARY_DIR}/CERTIConfigVersion.cmake" @ONLY)
+
+# Install the Config mode files
+install(FILES
+        ${PROJECT_BINARY_DIR}/CERTIConfig.cmake
+        ${PROJECT_BINARY_DIR}/CERTIConfigVersion.cmake
+        DESTINATION share/scripts)
+# And the exported set
+install(EXPORT CERTIDepends DESTINATION share/scripts)
+
 IF (WIN32)
   MESSAGE(STATUS "*** CERTI for WIN32 has been successfully configured 
********")
 ELSE (WIN32)
@@ -550,3 +568,5 @@
 ### Uninstall ###
 configure_file("${CMAKE_HOME_DIRECTORY}/cmake_uninstall.cmake.in" 
"cmake_uninstall.cmake" IMMEDIATE @ONLY)
 add_custom_target(uninstall "${CMAKE_COMMAND}" -P "cmake_uninstall.cmake")
+
+

Index: libCERTI/CMakeLists.txt
===================================================================
RCS file: /sources/certi/certi/libCERTI/CMakeLists.txt,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- libCERTI/CMakeLists.txt     18 Dec 2011 13:28:09 -0000      1.38
+++ libCERTI/CMakeLists.txt     18 Dec 2011 16:02:22 -0000      1.39
@@ -215,7 +215,7 @@
 SET_TARGET_PROPERTIES(CERTI PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION 
${PACKAGE_VERSION_MAJOR})
 
 INSTALL(TARGETS CERTI
-    EXPORT certi-targets
+    EXPORT CERTIDepends
     RUNTIME DESTINATION bin
     LIBRARY DESTINATION lib
     ARCHIVE DESTINATION lib)

Index: libRTI/CMakeLists.txt
===================================================================
RCS file: /sources/certi/certi/libRTI/CMakeLists.txt,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- libRTI/CMakeLists.txt       1 Oct 2011 09:01:12 -0000       1.25
+++ libRTI/CMakeLists.txt       18 Dec 2011 16:02:23 -0000      1.26
@@ -241,10 +241,10 @@
 
 # Install rules for both libRTI-NG and libFedTime
 INSTALL(TARGETS RTI FedTime RTI1516 FedTime1516 ${VarData1516Target}
-    EXPORT certi-targets
+    EXPORT CERTIDepends
     RUNTIME DESTINATION bin
     LIBRARY DESTINATION lib
     ARCHIVE DESTINATION lib)
 
 
-  INSTALL(FILES RTI1516fedTime.h DESTINATION include/RTI)
\ No newline at end of file
+INSTALL(FILES RTI1516fedTime.h DESTINATION include/RTI)
\ No newline at end of file

Index: RTIA/CMakeLists.txt
===================================================================
RCS file: /sources/certi/certi/RTIA/CMakeLists.txt,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- RTIA/CMakeLists.txt 21 Mar 2010 17:10:11 -0000      1.9
+++ RTIA/CMakeLists.txt 18 Dec 2011 16:02:23 -0000      1.10
@@ -26,6 +26,7 @@
 TARGET_LINK_LIBRARIES(rtia HLA)
 
 INSTALL(TARGETS rtia 
+    EXPORT CERTIDepends
     RUNTIME DESTINATION bin
     LIBRARY DESTINATION lib
     ARCHIVE DESTINATION lib)

Index: CERTIConfig.cmake.in
===================================================================
RCS file: CERTIConfig.cmake.in
diff -N CERTIConfig.cmake.in
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ CERTIConfig.cmake.in        18 Dec 2011 16:02:22 -0000      1.1
@@ -0,0 +1,23 @@
+# - Config file for the CERTI package
+# It defines the following variables
+#  CERTI_INCLUDE_DIRS          - include directories for CERTI
+#  CERTI_LIBRARIES             - libraries to link against
+#  CERTI_RTIA_EXECUTABLE       - the converter executable
+#  CERTI_RTIG_EXECUTABLE       - the tracer executable
+ 
+# Compute paths
+get_filename_component(CERTI_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+if(EXISTS "${CERTI_CMAKE_DIR}/CMakeCache.txt")
+   # In build tree
+   include("${CERTI_CMAKE_DIR}/CERTIBuildTreeSettings.cmake")
+else()
+   set(CERTI_INCLUDE_DIRS "${CERTI_CMAKE_DIR}/@CONF_REL_INCLUDE_DIR@")
+endif()
+ 
+# Our library dependencies (contains definitions for IMPORTED targets)
+include("${CERTI_CMAKE_DIR}/CERTIDepends.cmake")
+ 
+# These are IMPORTED targets created by CERTIDepends.cmake
+set(CERTI_LIBRARIES CERTI RTI HLA)
+set(CERTI_RTIA_EXECUTABLE rtia)
+set(CERTI_RTIG_EXECUTABLE rtig)

Index: CERTIConfigVersion.cmake.in
===================================================================
RCS file: CERTIConfigVersion.cmake.in
diff -N CERTIConfigVersion.cmake.in
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ CERTIConfigVersion.cmake.in 18 Dec 2011 16:02:22 -0000      1.1
@@ -0,0 +1,11 @@
+set(PACKAGE_VERSION "@PACKAGE_VERSION@")
+ 
+# Check whether the requested PACKAGE_FIND_VERSION is compatible
+if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}")
+  set(PACKAGE_VERSION_COMPATIBLE FALSE)
+else()
+  set(PACKAGE_VERSION_COMPATIBLE TRUE)
+  if ("${PACKAGE_VERSION}" VERSION_EQUAL "${PACKAGE_FIND_VERSION}")
+    set(PACKAGE_VERSION_EXACT TRUE)
+  endif()
+endif()

Index: CERTIBuildTreeSettings.cmake.in
===================================================================
RCS file: CERTIBuildTreeSettings.cmake.in
diff -N CERTIBuildTreeSettings.cmake.in
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ CERTIBuildTreeSettings.cmake.in     18 Dec 2011 16:02:22 -0000      1.1
@@ -0,0 +1,3 @@
+set(SCHEDMCORE_INCLUDE_DIRS
+  "@PROJECT_SOURCE_DIR@/lib"
+  "@PROJECT_BINARY_DIR@/lib")