Cmake build: Distinguish between PROGRAM_SUFFIX and LYX_VERSION

[lyx.git] / development / cmake / Install.cmake

diff --git a/development/cmake/Install.cmake b/development/cmake/Install.cmake
index 3e855e7cebd5197babbaaa50c7a08d0759d7464b..f4784e079d2f3b371ec0134d143ece8c22f85686 100755 (executable)
--- a/development/cmake/Install.cmake
+++ b/development/cmake/Install.cmake
@@ -130,6 +130,10 @@ lyx_install("data" ${TOP_SRC_DIR}/lib .            *      .)
 lyx_install("data" ${TOP_SRC_DIR}/3rdparty scripts/evince_sync            *      .)
 
 # Install
+set(lyxrcorig "")
+set(program_suffix ${PROGRAM_SUFFIX})
+set(version_suffix ${LYX_VERSION})
+
 if(APPLE)
   if(LYX_BUNDLE)
     install(FILES ${TOP_SRC_DIR}/development/MacOSX/spotlight/Info.plist DESTINATION "${MACOSX_BUNDLE_STARTUP_COMMAND}/Contents/Library/Spotlight/LyX-Metadata.mdimporter/Contents")
@@ -140,15 +144,20 @@ if(APPLE)
     install(PROGRAMS "${TOP_SRC_DIR}/development/MacOSX/${_i}" DESTINATION "${LYX_UTILITIES_INSTALL_PATH}")
   endforeach()
   install(FILES "${TOP_SRC_DIR}/development/MacOSX/LyX.icns" DESTINATION "${LYX_DATA_SUBDIR}")
-  set(program_suffix ${PROGRAM_SUFFIX})
-  configure_file("${TOP_SRC_DIR}/development/MacOSX/lyxrc.dist.in" lyxrc.dist)
-  lyx_install("data" ${CMAKE_CURRENT_BINARY_DIR} . lyxrc.dist .)
+  set(lyxrcorig "${TOP_SRC_DIR}/development/MacOSX/lyxrc.dist.in")
 elseif(UNIX)
-  set(program_suffix ${PROGRAM_SUFFIX})
   configure_file(${TOP_SRC_DIR}/lib/lyx.desktop.in lyx${PROGRAM_SUFFIX}.desktop)
   install(FILES ${CMAKE_CURRENT_BINARY_DIR}/lyx${PROGRAM_SUFFIX}.desktop DESTINATION ${SYSTEM_DATADIR}/applications)
   install(FILES ${TOP_SRC_DIR}/lib/images/lyx.svg RENAME lyx${PROGRAM_SUFFIX}.svg DESTINATION ${SYSTEM_DATADIR}/icons/hicolor/scalable/apps/)
-  configure_file(${TOP_SRC_DIR}/development/unix/lyxrc.dist.in lyxrc.dist)
+  set(lyxrcorig "${TOP_SRC_DIR}/development/unix/lyxrc.dist.in")
+elseif(CYGWIN)
+  set(lyxrcorig "${TOP_SRC_DIR}/development/cygwin/lyxrc.dist.in")
+elseif(WIN32)
+  set(lyxrcorig "${TOP_SRC_DIR}/development/win32/lyxrc.dist.in")
+endif()
+
+if(NOT lyxrcorig STREQUAL "")
+  configure_file("${lyxrcorig}" lyxrc.dist)
   lyx_install("data" ${CMAKE_CURRENT_BINARY_DIR} . lyxrc.dist .)
 endif()
 
@@ -156,7 +165,6 @@ if(USE_POSIX_PACKAGING AND EXISTS "${TOP_SRC_DIR}/lib/usr.bin.lyxwrap.in")
   # handle lyxwrap
   #get_filename_component(prefix "${CMAKE_INSTALL_PREFIX}" REALPATH)
   set(prefix "${CMAKE_INSTALL_PREFIX}")
-  set(version_suffix ${PROGRAM_SUFFIX})
   string(REGEX REPLACE "^/" "" lyxwrapprefix1 "${prefix}")
   string(REPLACE "/" "." lyxwrapprefix ${lyxwrapprefix1})
   #message(STATUS "lyxwrapprefix = ${lyxwrapprefix}")