w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-25 05:38:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feat-map65-integration' of bitbucket.org:k1jt/wsjtx into feat-map65-integration

Browse Source
This commit is contained in:
Joe Taylor 2021-05-30 12:08:33 -04:00
commit 61a48d0f1b
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
map65/CMakeLists.txt
View File

@ -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_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) target_link_libraries (map65 wsjt_qt m65impl ${FFTW3_LIBRARIES} Qt5::Widgets Qt5::Network Portaudio::Portaudio Usb::Usb)
install ( if (WIN32)
CODE "get_filename_component (_path \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/wsjtx_dir.txt\" REALPATH) install (
CODE "get_filename_component (_path \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}/wsjtx_dir.txt\" REALPATH)
if (WIN32) if (WIN32)
set (_separator \"\\\\\") set (_separator \"\\\\\")
else () else ()
set (_separator \"/\") set (_separator \"/\")
endif () endif ()
file (WRITE \"\${_path}\" \".\${_separator}\\n\")" file (WRITE \"\${_path}\" \".\${_separator}\\n\")"
) )
install ( install (
TARGETS map65 TARGETS map65
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
BUNDLE DESTINATION . COMPONENT runtime BUNDLE DESTINATION . COMPONENT runtime
) )
endif ()

12
map65/libm65/CMakeLists.txt
View File

@ -138,8 +138,10 @@ target_link_libraries (mapsim m65impl ${FFTW3_LIBRARIES})
add_executable (synctest synctest.f90) add_executable (synctest synctest.f90)
target_link_libraries (synctest m65impl ${FFTW3_LIBRARIES}) target_link_libraries (synctest m65impl ${FFTW3_LIBRARIES})
install ( if (WIN32)
TARGETS m65 mapsim install (
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime TARGETS m65 mapsim
BUNDLE DESTINATION . COMPONENT runtime RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT runtime
) BUNDLE DESTINATION . COMPONENT runtime
)
endif ()