w4kek
/
WSJT-X
mirror of https://github.com/saitohirga/WSJT-X.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make default Linux Release builds FOSS compliant 

The  kavasd binary  is  not  open source  so  cannot be  automatically
bundled with WSJT-X on Linux.

The CMake option  WSJT_INCLUDE_KVASD has been added with  a default of
OFF in Linux Release configuration builds.

Merged from wsjtx-1.4 branch.




git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4498 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville 2014-10-09 03:03:25 +00:00
parent 6a8f7cbd91
commit c484fe8707
2 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
CMakeLists.txt
View File

@ -71,11 +71,17 @@ option (WSJT_TRACE_CAT_POLLS "Debugging option that turns on CAT diagnostics dur
option (WSJT_HAMLIB_TRACE "Debugging option that turns on full Hamlib internal diagnostics.") option (WSJT_HAMLIB_TRACE "Debugging option that turns on full Hamlib internal diagnostics.")
option (WSJT_STANDARD_FILE_LOCATIONS "All non-installation files located in \"Standard\" platfom specific locations." ON) option (WSJT_STANDARD_FILE_LOCATIONS "All non-installation files located in \"Standard\" platfom specific locations." ON)
option (WSJT_SOFT_KEYING "Apply a ramp to CW keying envelope to reduce transients." ON) option (WSJT_SOFT_KEYING "Apply a ramp to CW keying envelope to reduce transients." ON)
option (WSJT_SKIP_MANPAGES "Skip *nix manpage generation") option (WSJT_SKIP_MANPAGES "Skip *nix manpage generation.")
CMAKE_DEPENDENT_OPTION (WSJT_ENABLE_EXPERIMENTAL_FEATURES "Enable features not fully ready for public releases." ON CMAKE_DEPENDENT_OPTION (WSJT_ENABLE_EXPERIMENTAL_FEATURES "Enable features not fully ready for public releases." ON
"is_debug_build" OFF) "is_debug_build" OFF)
#
# decide if we are bundling kvasd (non-FOSS)
#
CMAKE_DEPENDENT_OPTION (WSJT_INCLUDE_KVASD "Include kvasd in the package." OFF
"NOT is_debug_build;NOT WIN32;NOT APPLE" ON)
# #
# install locations # install locations
@ -609,16 +615,19 @@ elseif (CMAKE_HOST_WIN32)
endif () endif ()
# if (WSJT_INCLUDE_KVASD)
# fetch and validate kvasd #
# # fetch and validate kvasd
add_custom_command ( #
OUTPUT contrib/kvasd${CMAKE_EXECUTABLE_SUFFIX} set (KVASD contrib/kvasd${CMAKE_EXECUTABLE_SUFFIX})
COMMAND ${CMAKE_COMMAND} -D SYSTEM_NAME=${CMAKE_SYSTEM_NAME} -D EXECUTABLE_SUFFIX=${CMAKE_EXECUTABLE_SUFFIX} -P ${CMAKE_SOURCE_DIR}/CMake/download_kvasd.cmake add_custom_command (
DEPENDS CMake/download_kvasd.cmake OUTPUT ${KVASD}
COMMENT "Downloading kvasd for ${CMAKE_SYSTEM_NAME}" COMMAND ${CMAKE_COMMAND} -D SYSTEM_NAME=${CMAKE_SYSTEM_NAME} -D EXECUTABLE_SUFFIX=${CMAKE_EXECUTABLE_SUFFIX} -P ${CMAKE_SOURCE_DIR}/CMake/download_kvasd.cmake
VERBATIM DEPENDS CMake/download_kvasd.cmake
) COMMENT "Downloading kvasd for ${CMAKE_SYSTEM_NAME}"
VERBATIM
)
endif (WSJT_INCLUDE_KVASD)
# UI generation # UI generation
@ -675,7 +684,7 @@ add_executable (wsjtx WIN32 MACOSX_BUNDLE
wsjtx.rc wsjtx.rc
${WSJTX_ICON_FILE} ${WSJTX_ICON_FILE}
${wsjtx_RESOURCES_RCC} ${wsjtx_RESOURCES_RCC}
contrib/kvasd${CMAKE_EXECUTABLE_SUFFIX} ${KVASD}
contrib/${PROJECT_MANUAL} contrib/${PROJECT_MANUAL}
) )
qt5_use_modules (wsjtx Widgets OpenGL Network Multimedia) qt5_use_modules (wsjtx Widgets OpenGL Network Multimedia)
@ -719,11 +728,13 @@ install (TARGETS jt9 jt65code jt9code
#COMPONENT Runtime #COMPONENT Runtime
) )
install (PROGRAMS if (WSJT_INCLUDE_KVASD)
${CMAKE_BINARY_DIR}/contrib/kvasd${CMAKE_EXECUTABLE_SUFFIX} install (PROGRAMS
DESTINATION ${WSJT_BIN_DESTINATION} ${CMAKE_BINARY_DIR}/${KVASD}
#COMPONENT Runtime DESTINATION ${WSJT_BIN_DESTINATION}
#COMPONENT Runtime
) )
endif (WSJT_INCLUDE_KVASD)
install (PROGRAMS install (PROGRAMS
${RIGCTLD_EXE} ${RIGCTLD_EXE}

1
wsjtx_config.h.in
View File

@ -25,6 +25,7 @@
#cmakedefine01 WSJT_STANDARD_FILE_LOCATIONS #cmakedefine01 WSJT_STANDARD_FILE_LOCATIONS
#cmakedefine01 WSJT_SOFT_KEYING #cmakedefine01 WSJT_SOFT_KEYING
#cmakedefine01 WSJT_ENABLE_EXPERIMENTAL_FEATURES #cmakedefine01 WSJT_ENABLE_EXPERIMENTAL_FEATURES
#cmakedefine01 WSJT_INCLUDE_KVASD
#define WSJTX_STRINGIZE1(x) #x #define WSJTX_STRINGIZE1(x) #x
#define WSJTX_STRINGIZE(x) WSJTX_STRINGIZE1(x) #define WSJTX_STRINGIZE(x) WSJTX_STRINGIZE1(x)