]> git.lyx.org Git - features.git/commitdiff
cmake: also support binary releases on Linux
authorPeter Kümmel <syntheticpp@gmx.net>
Sat, 21 May 2011 10:29:41 +0000 (10:29 +0000)
committerPeter Kümmel <syntheticpp@gmx.net>
Sat, 21 May 2011 10:29:41 +0000 (10:29 +0000)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38797 a592a061-630c-0410-9148-cb99ea01b6c8

CMakeLists.txt

index a98df1a2506f3e4c201970e469de014f56ac047e..d5d6b27c1b77ed4f352ec6b217f453810bde82df 100644 (file)
@@ -682,9 +682,13 @@ endif()
 # so we do not provide infofiles for
 # CPACK_RESOURCE_FILE_README and CPACK_RESOURCE_FILE_WELCOME
 
-if(WIN32)
+if(UNIX)
+       set(CPACK_GENERATOR STGZ)
+       set(CPACK_SOURCE_GENERATOR TGZ TBZ2)
+elseif(WIN32)
        set(CPACK_GENERATOR NSIS ZIP)
        set(CPACK_BINARY_ZIP 1)
+       set(CPACK_SOURCE_GENERATOR ZIP)
 endif()
 
 
@@ -692,11 +696,10 @@ set(CPACK_STRIP_FILES 1)
 
 # sources
 set(CPACK_SOURCE_INSTALLED_DIRECTORIES "${TOP_SRC_DIR};/") # http://www.mail-archive.com/cmake@cmake.org/msg33720.html
-set(CPACK_SOURCE_GENERATOR TGZ ZIP TBZ2)
 
 
-if(LYX_CPACK)
 
+if(LYX_CPACK)
        set(CPACK_PACKAGE_NAME LyX)
        if(APPLE)
                set(CPACK_GENERATOR DragNDrop)  
@@ -708,11 +711,13 @@ if(LYX_CPACK)
                set(CPACK_GENERATOR ZIP)
                message(STATUS "NSIS files are created in ${CMAKE_BINARY_DIR}/installer")
                message(STATUS "A zipped only release could be created by building the 'PACKAGE' project")
-       elseif()
-               # .sh on linux?
+       else()
+               message(STATUS "Building self extracting binary bundle.")
+               message(STATUS "To embed Qt in this bundle don't build with your system Qt:")
+               message(STATUS "  - fix PATH so a other qmake is found by cmake")
+               message(STATUS "  - fix LD_LIBRARY_PATH so lyx doesn't use system's Qt")
        endif()
 
-
        include(CPack)
 endif()