[certi-cvs] certi libRTI/CMakeLists.txt CMakeLists.txt

[CERTI CVS commits]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      11/07/26 09:27:19

Modified files:
        libRTI         : CMakeLists.txt 
        .              : CMakeLists.txt 

Log message:
        Add the CERTI_RTING_DLL_USE_LIB_PREFIX 
        CMake OPTION in order to ease the constrution
        of libRTI-NG.dll and libFedTime.dll instead of RTI-NG.dll
        and FedTime.dll on Windows.
        This was requested by a user on the ML.
        This is NOT the default behavior.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/libRTI/CMakeLists.txt?cvsroot=certi&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/certi/CMakeLists.txt?cvsroot=certi&r1=1.102&r2=1.103

Patches:
Index: libRTI/CMakeLists.txt
===================================================================
RCS file: /sources/certi/certi/libRTI/CMakeLists.txt,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- libRTI/CMakeLists.txt       26 Apr 2011 11:07:38 -0000      1.20
+++ libRTI/CMakeLists.txt       26 Jul 2011 09:27:18 -0000      1.21
@@ -67,7 +67,11 @@
     SET_TARGET_PROPERTIES(RTI PROPERTIES COMPILE_FLAGS "-DLEGACY_LIBRTI")
 ELSE (BUILD_LEGACY_LIBRTI)
     MESSAGE(STATUS "libRTI variant: HLA 1.3 NG")
+    IF (WIN32 AND CERTI_RTING_DLL_USE_LIB_PREFIX)
+       SET_TARGET_PROPERTIES(RTI PROPERTIES OUTPUT_NAME "libRTI-NG")
+    ELSE()
     SET_TARGET_PROPERTIES(RTI PROPERTIES OUTPUT_NAME "RTI-NG")
+    ENDIF()
     SET_TARGET_PROPERTIES(RTI PROPERTIES COMPILE_FLAGS "-DHLA13NG_LIBRTI")
 ENDIF (BUILD_LEGACY_LIBRTI)
 SET_TARGET_PROPERTIES(RTI PROPERTIES VERSION 1.0.0 SOVERSION 1)
@@ -121,6 +125,10 @@
 
 TARGET_LINK_LIBRARIES(FedTime RTI)
 
+IF (WIN32 AND CERTI_RTING_DLL_USE_LIB_PREFIX)
+   SET_TARGET_PROPERTIES(FedTime PROPERTIES OUTPUT_NAME "libFedTime")
+ENDIF()
+
 SET_TARGET_PROPERTIES(FedTime PROPERTIES PROJECT_LABEL LibFedTime)
 IF (MINGW)
     SET_TARGET_PROPERTIES(FedTime PROPERTIES LINK_FLAGS 
"-Wl,--output-def,${LIBRARY_OUTPUT_PATH}/libFedTime.def")

Index: CMakeLists.txt
===================================================================
RCS file: /sources/certi/certi/CMakeLists.txt,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -b -r1.102 -r1.103
--- CMakeLists.txt      27 Apr 2011 16:02:12 -0000      1.102
+++ CMakeLists.txt      26 Jul 2011 09:27:18 -0000      1.103
@@ -62,6 +62,12 @@
 OPTION(BUILD_LEGACY_LIBRTI
              "Build CERTI legacy libRTI" OFF)
 
+IF (NOT BUILD_LEGACY_LIBRTI AND WIN32)
+   OPTION(CERTI_RTING_DLL_USE_LIB_PREFIX
+          "Use lib prefix for DLL (Windows Only)" 
+          OFF)
+ENDIF()
+
 OPTION(BUILD_DOC
              "Build documentation (using doxygen)" OFF)