From ee4ae6589e47fde6185d1f6b1babf595379d3a02 Mon Sep 17 00:00:00 2001 From: Bill Somerville Date: Fri, 16 Aug 2013 00:24:32 +0000 Subject: [PATCH] More complete CMake install target including sample WAV files from SVN, user manual and, HRD Interface runtime on Windows. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3554 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- CMakeLists.txt | 14 ++++++++++---- lib/CMakeLists.txt | 6 +++--- 130418_1742.wav => samples/130418_1742.wav | Bin 130610_2343.wav => samples/130610_2343.wav | Bin 4 files changed, 13 insertions(+), 7 deletions(-) rename 130418_1742.wav => samples/130418_1742.wav (100%) rename 130610_2343.wav => samples/130610_2343.wav (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 665011c2b..7b29e018f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,8 +2,8 @@ cmake_minimum_required (VERSION 2.8.9) project (wsjtx C CXX Fortran) -set (wsjtx_VERSION_MAJOR 1) -set (wsjtx_VERSION_MINOR 2) +set (WSJTX_VERSION_MAJOR 1) +set (WSJTX_VERSION_MINOR 2) if (POLICY CMP0020) cmake_policy (SET CMP0020 NEW) # link to Qt winmain on Windows @@ -124,7 +124,7 @@ add_subdirectory (lib) # UI generation qt5_wrap_ui (GENUISRCS ${UISRCS}) -add_executable (wsjtx ${CXXSRCS} ${GENUISRCS} ${GENQRC}) +add_executable (wsjtx ${CXXSRCS} ${GENUISRCS} wsjtx.rc) target_link_libraries (wsjtx jt9impl ${hamlib} ${fftw3f}) if (WIN32) target_link_libraries (wsjtx ${CMAKE_CURRENT_SOURCE_DIR}/libHRDInterface001.a) @@ -143,15 +143,21 @@ install ( ) install (DIRECTORY Palettes DESTINATION bin PATTERN *.pal) +install (DIRECTORY samples DESTINATION bin/save) install ( PROGRAMS ${CMAKE_BINARY_DIR}/contrib/kvasd${CMAKE_EXECUTABLE_SUFFIX} DESTINATION bin ) +install ( + FILES WSJT-X_Users_Guide_v${WSJTX_VERSION_MAJOR}.${WSJTX_VERSION_MINOR}.docx + DESTINATION bin + ) + if (WIN32) install ( - FILES ${hamlib} ${hamlib-backends} ${fftw3f} ${usb} + FILES ${hamlib} ${hamlib-backends} ${fftw3f} ${usb} contrib/HRDInterface001.dll DESTINATION bin COMPONENT Runtime ) endif (WIN32) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 71d9e876a..7dcb7f1ac 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -168,13 +168,13 @@ add_definitions (-DBIGSYM=1) add_library (jt9impl STATIC ${FSRCS} ${CSRCS} ${CXXSRCS}) qt5_use_modules (jt9impl Core) -add_executable (jt9sim jt9sim.f90) +add_executable (jt9sim jt9sim.f90 ../wsjtx.rc) target_link_libraries (jt9sim jt9impl) -add_executable (jt9code jt9code.f90) +add_executable (jt9code jt9code.f90 ../wsjtx.rc) target_link_libraries (jt9code jt9impl) -add_executable (jt9 jt9.f90 jt9a.f90 jt9b.f90 jt9c.f90) +add_executable (jt9 jt9.f90 jt9a.f90 jt9b.f90 jt9c.f90 ../wsjtx.rc) target_link_libraries (jt9 jt9impl ${fftw3f}) add_dependencies (jt9 fftw3f) qt5_use_modules (jt9 Core) diff --git a/130418_1742.wav b/samples/130418_1742.wav similarity index 100% rename from 130418_1742.wav rename to samples/130418_1742.wav diff --git a/130610_2343.wav b/samples/130610_2343.wav similarity index 100% rename from 130610_2343.wav rename to samples/130610_2343.wav