Removed _one_ perl-dependency in creating po-files.

[lyx.git] / development / cmake / CMakeLists.txt

diff --git a/development/cmake/CMakeLists.txt b/development/cmake/CMakeLists.txt
index 035bc98d2751392671a1588a2348f75cfb3cbba9..2913288caa8fc0b24082309303379e6f30b36970 100644 (file)
--- a/development/cmake/CMakeLists.txt
+++ b/development/cmake/CMakeLists.txt
@@ -38,9 +38,10 @@ LYX_OPTION(PROFILE "Build profile version" OFF GCC)
 LYX_OPTION(USE_EXTERNAL_BOOST "Use external boost" OFF GCC)
 LYX_OPTION(USE_EXTERNAL_LIBINTL "Use external libintl" ON ALL)
 LYX_OPTION(INSTALL "Build install projects/rules" ON ALL)
-LYX_OPTION(USE_VERSION_SUFFIX "Use version suffix for packaging" OFF ALL)
+LYX_OPTION(PACKAGE_SUFFIX "Use version suffix for packaging" OFF ALL)
+LYX_OPTION(PROGRAM_SUFFIX "Append version suffix to binaries" ON GCC)
 LYX_OPTION(NO_CONSOLE "Suppress console on Windows" OFF MSVC)
-LYX_OPTION(VLD "Use VLD on with MSVC" OFF MSVC)
+LYX_OPTION(VLD "Use VLD with MSVC" OFF MSVC)
 LYX_OPTION(DISABLE_PCH "Disable precompiled headers" ON ALL)
 LYX_OPTION(MERGE_FILES "Merge source files into one compilation unit" OFF ALL)
 LYX_OPTION(DEBUG_GLIBC "Enable libstdc++ debug mode" OFF GCC)
@@ -122,11 +123,16 @@ foreach(_c_l ${_config_lines} )
   endif()
 endforeach(_c_l)
 
-if(LYX_USE_VERSION_SUFFIX)
+
+if(LYX_PACKAGE_SUFFIX)
   set(PACKAGE ${PACKAGE_BASE}${LYX_INSTALL_SUFFIX})
-  set(PROGRAM_SUFFIX "${LYX_INSTALL_SUFFIX}")
 else()  
   set(PACKAGE ${PACKAGE_BASE})
+endif()
+
+if(LYX_PROGRAM_SUFFIX)
+  set(PROGRAM_SUFFIX "${LYX_INSTALL_SUFFIX}")
+else()
   set(PROGRAM_SUFFIX "")
 endif()
 
@@ -421,9 +427,9 @@ if(MSVC)
 
 endif()
 
-
 FIND_PROGRAM(_PERL_EXECUTABLE perl)
-if(NOT ${_PERL_EXECUTABLE} MATCHES "-NOTFOUND")
+FIND_PROGRAM(_PYTHON_EXECUTABLE python)
+if( NOT ${_PYTHON_EXECUTABLE} MATCHES "-NOTFOUND")
     if(LYX_NLS)
       find_package(LyXGettext REQUIRED)
       include_directories(${TOP_SRC_DIR}/po)
@@ -431,8 +437,6 @@ if(NOT ${_PERL_EXECUTABLE} MATCHES "-NOTFOUND")
     endif()
 endif()
 
-
-
 if(LYX_DEBUG_GLIBC)
   set(_GLIBCXX_DEBUG 1)
 endif()