From 053ae1483376783e0af6023b4a3c04e7a4854037 Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Tue, 8 Dec 2015 00:28:02 +0000 Subject: [PATCH] Fix a regression in the configured r/o data location This change will require the following CMakeCache.txt entries to be deleted: WSJTX_DATA_DESTINATION WSJTX_DOC_DESTINATION so that default values can be substituted by CMake. Merged from ^/branches/wsjtx. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx-1.6@6245 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0a7bb86cc..9511cfc68 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -159,8 +159,8 @@ set (QT_CONF_DESTINATION bin) if (WIN32) set (SHARE_DESTINATION bin) - set (DOC_DESTINATION ${SHARE_DESTINATION}/doc) - set (DATA_DESTINATION ${SHARE_DESTINATION}/data) + set (DOC_DESTINATION doc) + set (DATA_DESTINATION data) set (PLUGIN_DESTINATION plugins) endif (WIN32)