w4kek
/
WSJT-X
mirror of https://github.com/saitohirga/WSJT-X.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Another attempt to get installed locations right 

That is, right for all platforms with both local and package installs.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6248 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville 2015-12-08 20:39:50 +00:00
parent eef31e186b
commit c5ea6938d3
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

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

2
doc/CMakeLists.txt
View File

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