w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-23 12:48:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Another attempt to get installed locations right

Browse Source 
That is, right for all platforms with both local and package installs.
Install copyright and Debian change log in correct package directory.

Merged from ^/branches/wsjtx.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx-1.6@6250 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville 2015-12-08 21:10:19 +00:00
parent 053ae14833
commit 85c2903db4
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -151,8 +151,8 @@ message (STATUS "******************************************************")
set (BIN_DESTINATION bin) set (BIN_DESTINATION bin)
set (LIB_DESTINATION lib) set (LIB_DESTINATION lib)
set (SHARE_DESTINATION share) set (SHARE_DESTINATION share)
set (DOC_DESTINATION ${SHARE_DESTINATION}/doc/${CMAKE_PROJECT_NAME}) set (DOC_DESTINATION doc/${CMAKE_PROJECT_NAME})
set (DATA_DESTINATION ${SHARE_DESTINATION}/${CMAKE_PROJECT_NAME}) set (DATA_DESTINATION ${CMAKE_PROJECT_NAME})
set (MANPAGE_DESTINATION ${SHARE_DESTINATION}) set (MANPAGE_DESTINATION ${SHARE_DESTINATION})
set (PLUGIN_DESTINATION lib/plugins) set (PLUGIN_DESTINATION lib/plugins)
set (QT_CONF_DESTINATION bin) set (QT_CONF_DESTINATION bin)
@ -168,8 +168,8 @@ if (APPLE)
set (BIN_DESTINATION ${CMAKE_PROJECT_NAME}.app/Contents/MacOS) set (BIN_DESTINATION ${CMAKE_PROJECT_NAME}.app/Contents/MacOS)
set (SHARE_DESTINATION ${CMAKE_PROJECT_NAME}.app/Contents/Resources) set (SHARE_DESTINATION ${CMAKE_PROJECT_NAME}.app/Contents/Resources)
set (MANPAGE_DESTINATION ${CMAKE_PROJECT_NAME}.app/Contents/Resources) set (MANPAGE_DESTINATION ${CMAKE_PROJECT_NAME}.app/Contents/Resources)
set (DOC_DESTINATION ${SHARE_DESTINATION}/doc) set (DOC_DESTINATION doc)
set (DATA_DESTINATION ${SHARE_DESTINATION}/data) set (DATA_DESTINATION data)
set (PLUGIN_DESTINATION ${CMAKE_PROJECT_NAME}.app/Contents/PlugIns) set (PLUGIN_DESTINATION ${CMAKE_PROJECT_NAME}.app/Contents/PlugIns)
set (QT_CONF_DESTINATION ${CMAKE_PROJECT_NAME}.app/Contents/Resources) set (QT_CONF_DESTINATION ${CMAKE_PROJECT_NAME}.app/Contents/Resources)
endif (APPLE) endif (APPLE)
@ -1033,13 +1033,13 @@ install (FILES
NEWS NEWS
INSTALL INSTALL
BUGS BUGS
DESTINATION ${WSJT_DOC_DESTINATION} DESTINATION ${WSJT_SHARE_DESTINATION}/${WSJT_DOC_DESTINATION}
#COMPONENT runtime #COMPONENT runtime
) )
install (FILES install (FILES
contrib/Ephemeris/JPLEPH contrib/Ephemeris/JPLEPH
DESTINATION ${WSJT_DATA_DESTINATION} DESTINATION ${WSJT_SHARE_DESTINATION}/${WSJT_DATA_DESTINATION}
#COMPONENT runtime #COMPONENT runtime
) )

2
debian/CMakeLists.txt vendored
View File

@ -34,6 +34,6 @@ configure_file (
install (FILES install (FILES
${CMAKE_CURRENT_BINARY_DIR}/${deb_changelog}.gz ${CMAKE_CURRENT_BINARY_DIR}/${deb_changelog}.gz
${CMAKE_CURRENT_BINARY_DIR}/copyright ${CMAKE_CURRENT_BINARY_DIR}/copyright
DESTINATION ${WSJT_DOC_DESTINATION} DESTINATION ${WSJT_SHARE_DESTINATION}/${WSJT_DOC_DESTINATION}
#COMPONENT Debian #COMPONENT Debian
) )

2
doc/CMakeLists.txt
View File

@ -146,7 +146,7 @@ add_custom_target (docs ALL DEPENDS ${user_guide})
install (FILES install (FILES
${user_guide} ${user_guide}
DESTINATION ${WSJT_DOC_DESTINATION} DESTINATION ${WSJT_SHARE_DESTINATION}/${WSJT_DOC_DESTINATION}
RENAME ${PROJECT_MANUAL} RENAME ${PROJECT_MANUAL}
#COMPONENT runtime #COMPONENT runtime
) )