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

Improved Hamlib library location in configuration.

Browse Source 
Added more install files and removed installation of old docs.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3846 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville 2014-03-06 20:56:29 +00:00
parent 5f9b624632
commit c2eff2f520
2 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
CMakeLists.txt
View File

@ -3,7 +3,7 @@ cmake_minimum_required (VERSION 2.8.9)
project (wsjtx C CXX Fortran) project (wsjtx C CXX Fortran)
set (WSJTX_VERSION_MAJOR 1) set (WSJTX_VERSION_MAJOR 1)
set (WSJTX_VERSION_MINOR 2) set (WSJTX_VERSION_MINOR 3)
if (POLICY CMP0020) if (POLICY CMP0020)
cmake_policy (SET CMP0020 NEW) # link to Qt winmain on Windows cmake_policy (SET CMP0020 NEW) # link to Qt winmain on Windows
@ -73,19 +73,23 @@ set (UISRCS
# libfftw3 setup # libfftw3 setup
# #
find_path (fftw3f_INCLUDES fftw3.f) find_path (fftw3f_INCLUDES fftw3.f)
find_library (fftw3f NAMES fftw3f fftw3f-3) find_library (fftw3f_LIBRARIES NAMES fftw3f fftw3f-3)
include_directories (${fftw3f_INCLUDES}) include_directories (${fftw3f_INCLUDES})
# #
# libhamlib setup # libhamlib setup
# #
find_path (hamlib_INCLUDES hamlib/rig.h) find_path (hamlib_INCLUDES hamlib/rig.h)
find_library (hamlib NAMES hamlib hamlib-2) find_library (hamlib_LIBRARIES NAMES hamlib hamlib-2 PATH_SUFFIXES msvc gcc)
find_library (usb NAMES usb0)
find_path (hamlib-runtime-path libhamlib-2.dll)
file (GLOB hamlib-backends ${hamlib-runtime-path}/hamlib*.dll)
include_directories (${hamlib_INCLUDES}) include_directories (${hamlib_INCLUDES})
if (WIN32)
find_library (hamlib_RUNTIME NAMES hamlib hamlib-2 PATH_SUFFIXES bin)
get_filename_component (_hamlib_runtime_path "${hamlib_RUNTIME}" PATH)
file (GLOB hamlib_BACKENDS ${_hamlib_runtime_path}/hamlib*.dll)
find_library (usb_RUNTIME NAMES usb0 PATH_SUFFIXES bin)
endif (WIN32)
# #
# Qt5 setup # Qt5 setup
@ -150,11 +154,11 @@ add_custom_target (kvasd DEPENDS contrib/kvasd${CMAKE_EXECUTABLE_SUFFIX})
qt5_wrap_ui (GENUISRCS ${UISRCS}) qt5_wrap_ui (GENUISRCS ${UISRCS})
add_executable (wsjtx ${CXXSRCS} ${GENUISRCS} wsjtx.rc) add_executable (wsjtx ${CXXSRCS} ${GENUISRCS} wsjtx.rc)
target_link_libraries (wsjtx jt9impl ${hamlib} ${fftw3f}) target_link_libraries (wsjtx jt9impl ${hamlib_LIBRARIES} ${fftw3f_LIBRARIES})
if (WIN32) if (WIN32)
target_link_libraries (wsjtx ${CMAKE_CURRENT_SOURCE_DIR}/libHRDInterface001.a) target_link_libraries (wsjtx ${CMAKE_CURRENT_SOURCE_DIR}/libHRDInterface001.a)
endif (WIN32) endif (WIN32)
add_dependencies (wsjtx hamlib kvasd) add_dependencies (wsjtx kvasd)
qt5_use_modules (wsjtx Widgets Multimedia OpenGL) qt5_use_modules (wsjtx Widgets Multimedia OpenGL)
@ -166,20 +170,23 @@ install (
install (DIRECTORY Palettes DESTINATION bin PATTERN *.pal) install (DIRECTORY Palettes DESTINATION bin PATTERN *.pal)
install (DIRECTORY samples DESTINATION bin/save) install (DIRECTORY samples DESTINATION bin/save)
install (FILES
shortcuts.txt
mouse_commands.txt
prefixes.txt
cty.dat
kvasd.dat
DESTINATION bin
)
install ( install (
PROGRAMS ${CMAKE_BINARY_DIR}/contrib/kvasd${CMAKE_EXECUTABLE_SUFFIX} PROGRAMS ${CMAKE_BINARY_DIR}/contrib/kvasd${CMAKE_EXECUTABLE_SUFFIX}
DESTINATION bin DESTINATION bin
) )
install (
FILES WSJT-X_Users_Guide_v${WSJTX_VERSION_MAJOR}.${WSJTX_VERSION_MINOR}.docx
DESTINATION bin
)
if (WIN32) if (WIN32)
install ( install (
FILES ${hamlib} ${hamlib-backends} ${fftw3f} ${usb} contrib/HRDInterface001.dll FILES ${hamlib_RUNTIME} ${hamlib_BACKENDS} ${fftw3f_LIBRARIES} ${usb_RUNTIME} contrib/HRDInterface001.dll
DESTINATION bin COMPONENT Runtime DESTINATION bin COMPONENT Runtime
) )
endif (WIN32) endif (WIN32)

2
lib/CMakeLists.txt
View File

@ -197,7 +197,7 @@ add_executable (jt9code jt9code.f90 ../wsjtx.rc)
target_link_libraries (jt9code jt9impl) target_link_libraries (jt9code jt9impl)
add_executable (jt9 jt9.f90 jt9a.f90 jt9b.f90 jt9c.f90 ../wsjtx.rc) add_executable (jt9 jt9.f90 jt9a.f90 jt9b.f90 jt9c.f90 ../wsjtx.rc)
target_link_libraries (jt9 jt9impl ${fftw3f}) target_link_libraries (jt9 jt9impl ${fftw3f_LIBRARIES})
add_dependencies (jt9 fftw3f) add_dependencies (jt9 fftw3f)
qt5_use_modules (jt9 Core) qt5_use_modules (jt9 Core)