[certi-cvs] certi CMakeLists.txt scripts/SystemSpecificInfo...

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      10/01/15 15:06:33

Modified files:
        .              : CMakeLists.txt 
Added files:
        scripts        : SystemSpecificInformations.cmake 

Log message:
        Improve generated (binary) package name.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/CMakeLists.txt?cvsroot=certi&r1=1.77&r2=1.78
http://cvs.savannah.gnu.org/viewcvs/certi/scripts/SystemSpecificInformations.cmake?cvsroot=certi&rev=1.1

Patches:
Index: CMakeLists.txt
===================================================================
RCS file: /sources/certi/certi/CMakeLists.txt,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -b -r1.77 -r1.78
--- CMakeLists.txt      3 Dec 2009 14:36:52 -0000       1.77
+++ CMakeLists.txt      15 Jan 2010 15:06:32 -0000      1.78
@@ -399,23 +399,13 @@
   SET(CPACK_GENERATOR "TGZ;ZIP;RPM")
 ENDIF (WIN32)
 
-IF (NOT WIN32)
-  EXECUTE_PROCESS(COMMAND uname -m
-    OUTPUT_VARIABLE MACHINE)
-  STRING(REPLACE "\n" "" 
-    MACHINE
-    ${MACHINE})
-ELSE (NOT WIN32)
-  SET(MACHINE "UnknownCompiler")
-  IF (MINGW) 
-     SET(MACHINE "MinGW")
-  ENDIF (MINGW)
-  IF (MSVC)
-     SET(MACHINE "MSVC")
-  ENDIF (MSVC)  
-ENDIF (NOT WIN32)
+include(SystemSpecificInformations)
 
-SET(CPACK_SYSTEM_NAME ${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_VERSION}-${MACHINE})
+IF (SPECIFIC_COMPILER_NAME)
+    SET(CPACK_SYSTEM_NAME 
${SPECIFIC_SYSTEM_VERSION_NAME}-${SPECIFIC_COMPILER_NAME})
+ELSE (SPECIFIC_COMPILER_NAME)
+    SET(CPACK_SYSTEM_NAME ${SPECIFIC_SYSTEM_VERSION_NAME})
+ENDIF(SPECIFIC_COMPILER_NAME)
 
 # Avoid putting BUILDIR inside source package (simple case)
 IF ("${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")

Index: scripts/SystemSpecificInformations.cmake
===================================================================
RCS file: scripts/SystemSpecificInformations.cmake
diff -N scripts/SystemSpecificInformations.cmake
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ scripts/SystemSpecificInformations.cmake    15 Jan 2010 15:06:33 -0000      
1.1
@@ -0,0 +1,82 @@
+
+# define a set of string with may-be useful readable name
+# this file is meant to be included in a CMakeLists.txt
+# not as a standalone CMake script
+SET(SPECIFIC_COMPILER_NAME "")
+SET(SPECIFIC_SYSTEM_VERSION_NAME "")
+
+IF(WIN32)
+# information taken from
+# http://www.codeguru.com/cpp/w-p/system/systeminformation/article.php/c8973/
+       # Win9x series
+       IF(CMAKE_SYSTEM_VERSION MATCHES "4.0")
+               SET(SPECIFIC_SYSTEM_VERSION_NAME "Win95")
+       ENDIF(CMAKE_SYSTEM_VERSION MATCHES "4.0")
+       IF(CMAKE_SYSTEM_VERSION MATCHES "4.10")
+               SET(SPECIFIC_SYSTEM_VERSION_NAME "Win98")
+       ENDIF(CMAKE_SYSTEM_VERSION MATCHES "4.10")
+       IF(CMAKE_SYSTEM_VERSION MATCHES "4.90")
+               SET(SPECIFIC_SYSTEM_VERSION_NAME "WinME")
+       ENDIF(CMAKE_SYSTEM_VERSION MATCHES "4.90")
+
+       # WinNTyyy series
+       IF(CMAKE_SYSTEM_VERSION MATCHES "3.0")
+               SET(SPECIFIC_SYSTEM_VERSION_NAME "WinNT351")
+       ENDIF(CMAKE_SYSTEM_VERSION MATCHES "3.0")
+       IF(CMAKE_SYSTEM_VERSION MATCHES "4.1")
+               SET(SPECIFIC_SYSTEM_VERSION_NAME "WinNT4")
+       ENDIF(CMAKE_SYSTEM_VERSION MATCHES "4.1")
+
+        # Win2000/XP series
+       IF(CMAKE_SYSTEM_VERSION MATCHES "5.0")
+               SET(SPECIFIC_SYSTEM_VERSION_NAME "Win2000")
+       ENDIF(CMAKE_SYSTEM_VERSION MATCHES "5.0")
+       IF(CMAKE_SYSTEM_VERSION MATCHES "5.1")
+               SET(SPECIFIC_SYSTEM_VERSION_NAME "WinXP")
+       ENDIF(CMAKE_SYSTEM_VERSION MATCHES "5.1")
+       IF(CMAKE_SYSTEM_VERSION MATCHES "5.2")
+               SET(SPECIFIC_SYSTEM_VERSION_NAME "Win2003")
+       ENDIF(CMAKE_SYSTEM_VERSION MATCHES "5.2")
+
+       # WinVista/7 series
+       IF(CMAKE_SYSTEM_VERSION MATCHES "6.0")
+               SET(SPECIFIC_SYSTEM_VERSION_NAME "WinVISTA")
+       ENDIF(CMAKE_SYSTEM_VERSION MATCHES "6.0")
+       IF(CMAKE_SYSTEM_VERSION MATCHES "6.1")
+               SET(SPECIFIC_SYSTEM_VERSION_NAME "Win7")
+       ENDIF(CMAKE_SYSTEM_VERSION MATCHES "6.1")
+
+    # Compilers
+       # taken from http://predef.sourceforge.net/precomp.html#sec34
+       IF (MSVC)
+           IF(MSVC_VERSION EQUAL 1200)
+             SET(SPECIFIC_COMPILER_NAME "MSVC-6.0")
+           ENDIF(MSVC_VERSION EQUAL 1200)
+           IF(MSVC_VERSION EQUAL 1300)
+             SET(SPECIFIC_COMPILER_NAME "MSVC-7.0")
+           ENDIF(MSVC_VERSION EQUAL 1300)
+           IF(MSVC_VERSION EQUAL 1310)
+             SET(SPECIFIC_COMPILER_NAME "MSVC-7.1-2003") #Visual Studio 2003
+           ENDIF(MSVC_VERSION EQUAL 1310)
+           IF(MSVC_VERSION EQUAL 1400)
+             SET(SPECIFIC_COMPILER_NAME "MSVC-8.0-2005") #Visual Studio 2005
+           ENDIF(MSVC_VERSION EQUAL 1400)
+           IF(MSVC_VERSION EQUAL 1500)
+             SET(SPECIFIC_COMPILER_NAME "MSVC-9.0-2008") #Visual Studio 2008
+           ENDIF(MSVC_VERSION EQUAL 1500)
+       ENDIF(MSVC)
+       IF (MINGW)
+          SET(SPECIFIC_COMPILER_NAME "MinGW")
+       ENDIF(MINGW)
+       IF (CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
+       SET(SPECIFIC_SYSTEM_VERSION_NAME 
"${SPECIFIC_SYSTEM_VERSION_NAME}-x86_64")
+       ENDIF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
+ENDIF(WIN32)
+
+IF(UNIX)
+  EXECUTE_PROCESS(COMMAND uname -m OUTPUT_VARIABLE MACHINE)
+  STRING(REPLACE "\n" "" MACHINE ${MACHINE})
+  SET(SPECIFIC_SYSTEM_VERSION_NAME "${CMAKE_SYSTEM_NAME}-${MACHINE}")
+  #SET(SPECIFIC_SYSTEM_VERSION_NAME "${SPECIFIC_SYSTEM_VERSION_NAME}-x86_64")
+  SET(SPECIFIC_COMPILER_NAME "")
+ENDIF(UNIX)