Author: kuemmel
Date: Sat May 21 12:29:41 2011
New Revision: 38797
URL: http://www.lyx.org/trac/changeset/38797
Log:
cmake: also support binary releases on Linux
Modified:
lyx-devel/trunk/CMakeLists.txt
Modified: lyx-devel/trunk/CMakeLists.txt
==============================================================================
--- lyx-devel/trunk/CMakeLists.txt Sat May 21 11:50:41 2011 (r38796)
+++ lyx-devel/trunk/CMakeLists.txt Sat May 21 12:29:41 2011 (r38797)
@@ -682,9 +682,13 @@
# 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 @@
# sources
set(CPACK_SOURCE_INSTALLED_DIRECTORIES "${TOP_SRC_DIR};/") #
http://www.mail-archive.com/[email protected]/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 @@
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()