mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2024-11-25 05:38:46 -05:00
Merge branch 'feat-map65-integration' of bitbucket.org:k1jt/wsjtx into feat-map65-integration
This commit is contained in:
commit
61a48d0f1b
@ -51,18 +51,20 @@ add_executable (map65 ${map65_CXXSRCS} ${map65_CSRCS} ${map65_GENUISRCS} map65.r
|
||||
target_include_directories (map65 PRIVATE ${CMAKE_SOURCE_DIR} ${FFTW3_INCLUDE_DIRS})
|
||||
target_link_libraries (map65 wsjt_qt m65impl ${FFTW3_LIBRARIES} Qt5::Widgets Qt5::Network Portaudio::Portaudio Usb::Usb)
|
||||
|
||||
install (
|
||||
CODE "get_filename_component (_path \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/wsjtx_dir.txt\" REALPATH)
|
||||
if (WIN32)
|
||||
install (
|
||||
CODE "get_filename_component (_path \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/wsjtx_dir.txt\" REALPATH)
|
||||
if (WIN32)
|
||||
set (_separator \"\\\\\")
|
||||
else ()
|
||||
set (_separator \"/\")
|
||||
endif ()
|
||||
file (WRITE \"\${_path}\" \".\${_separator}\\n\")"
|
||||
)
|
||||
)
|
||||
|
||||
install (
|
||||
TARGETS map65
|
||||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
|
||||
BUNDLE DESTINATION . COMPONENT runtime
|
||||
)
|
||||
install (
|
||||
TARGETS map65
|
||||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
|
||||
BUNDLE DESTINATION . COMPONENT runtime
|
||||
)
|
||||
endif ()
|
@ -138,8 +138,10 @@ target_link_libraries (mapsim m65impl ${FFTW3_LIBRARIES})
|
||||
add_executable (synctest synctest.f90)
|
||||
target_link_libraries (synctest m65impl ${FFTW3_LIBRARIES})
|
||||
|
||||
install (
|
||||
TARGETS m65 mapsim
|
||||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
|
||||
BUNDLE DESTINATION . COMPONENT runtime
|
||||
)
|
||||
if (WIN32)
|
||||
install (
|
||||
TARGETS m65 mapsim
|
||||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
|
||||
BUNDLE DESTINATION . COMPONENT runtime
|
||||
)
|
||||
endif ()
|
||||
|
Loading…
Reference in New Issue
Block a user