From 1fe1080cf6c59bd2aaa8e7bd61406671cc400fa2 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Peter=20K=C3=BCmmel?= <syntheticpp@gmx.net>
Date: Sun, 8 Feb 2009 12:20:31 +0000
Subject: [PATCH] cmake: Kornel's package versions

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28396 a592a061-630c-0410-9148-cb99ea01b6c8
---
 development/cmake/CMakeLists.txt               | 10 +++++++++-
 development/cmake/modules/FindLyXGettext.cmake | 12 +++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/development/cmake/CMakeLists.txt b/development/cmake/CMakeLists.txt
index 3f1189be44..5340b6f7e1 100644
--- a/development/cmake/CMakeLists.txt
+++ b/development/cmake/CMakeLists.txt
@@ -37,7 +37,7 @@ endmacro(setstripped)
 
 foreach(_c_l ${_config_lines} )
   if(_c_l MATCHES "^AC_INIT\\(\([^,]+\),\([^,]+\),\([^,]+\)\(.*\)")
-    setstripped(PACKAGE ${CMAKE_MATCH_1})
+    setstripped(PACKAGE_tmp ${CMAKE_MATCH_1})
     setstripped(PACKAGE_VERSION ${CMAKE_MATCH_2})
     if(PACKAGE_VERSION MATCHES "^\([0-9]+\)\\.\([0-9]+\).*$")
       set(LYX_DIR_VER "LYX_DIR_${CMAKE_MATCH_1}${CMAKE_MATCH_2}x")
@@ -50,6 +50,14 @@ foreach(_c_l ${_config_lines} )
   endif()
 endforeach(_c_l)
 
+if(UseVersionSuffix)
+  message("-- Using versioned PACKAGE. Disable with -DUseVersionSuffix=0")
+  set(PACKAGE ${PACKAGE_tmp}${LYX_INSTALL_SUFFIX})
+else()
+  message("-- PACKAGE not versioned, to enable use -DUseVersionSuffix=1")
+  set(PACKAGE ${PACKAGE_tmp})
+endif()
+
 set(PROGRAM_SUFFIX "\"\"")
 if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
   # see http://www.cmake.org/pipermail/cmake/2006-October/011559.html
diff --git a/development/cmake/modules/FindLyXGettext.cmake b/development/cmake/modules/FindLyXGettext.cmake
index 00be65bc28..4f84edf79c 100755
--- a/development/cmake/modules/FindLyXGettext.cmake
+++ b/development/cmake/modules/FindLyXGettext.cmake
@@ -19,7 +19,17 @@ FIND_PROGRAM(GETTEXT_MSGFMT_EXECUTABLE msgfmt)
 MACRO(GETTEXT_CREATE_TRANSLATIONS _potFile _firstPoFile)
 
    SET(_gmoFiles)
-   GET_FILENAME_COMPONENT(_potBasename ${_potFile} NAME_WE)
+   # remove only the last extension e.g
+   # 	LyX2.0.pot ==> LyX2.0
+   # and not LyX2.0.pot ==> LyX2
+   # as it would be with NAME_WE
+   # GET_FILENAME_COMPONENT(_potBasename ${_potFile} NAME_WE)
+   GET_FILENAME_COMPONENT(_potname ${_potFile} NAME)
+   if (_potname MATCHES "^\(.+\)\\.[^\\.]+$")
+       set(_potBasename ${CMAKE_MATCH_1})
+   else()
+       set(_potBasename ${_potname})
+   endif()
    GET_FILENAME_COMPONENT(_absPotFile ${_potFile} ABSOLUTE)
 
    SET(_addToAll)
-- 
2.39.5