One more thing Bill
I am using the latest cmake.
Megan
On Thu, 17 May 2018 at 6:52 am, Megan Woods <[email protected]>
wrote:
> Hi Bill,
>
>
> Here is the diff.
>
>
>
> Index: CMakeLists.txt
> ===================================================================
> --- CMakeLists.txt (revision 8662)
> +++ CMakeLists.txt (working copy)
> @@ -15,7 +15,7 @@
>
> Earliest version we can support with Qt 5.8, C++11 & libc++ is 10.9.
> Do not override this if you intend to build an official deployable
> installer.")
> - set (CMAKE_OSX_SYSROOT
> /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk
> + set (CMAKE_OSX_SYSROOT
> /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk
> CACHE STRING "Mac OS X SDK to build with
>
> Change this to the newest SDK available that you can install on your
> system (10.11 preferred).
> @@ -875,9 +875,11 @@
> #
>
> # Widgets finds its own dependencies.
> +find_package (Qt5Core 5 REQUIRED)
> find_package (Qt5Widgets 5 REQUIRED)
> find_package (Qt5Multimedia 5 REQUIRED)
> find_package (Qt5PrintSupport 5 REQUIRED)
> +find_package (Qt5SerialPort 5 REQUIRED)
>
> if (WIN32)
> add_definitions (-DQT_NEEDS_QTMAIN)
> @@ -1150,14 +1152,16 @@
> # build a library for the QCustomPlot widget
> add_library (qcp STATIC ${qcp_CXXSRCS})
> target_include_directories (qcp PUBLIC
> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/qcustomplot-source>)
> -target_link_libraries (qcp Qt5::Widgets Qt5::PrintSupport)
> +target_link_libraries (qcp Qt5::Core Qt5::Widgets Qt5::PrintSupport)
>
> # build a library of package Qt functionality
> add_library (wsjt_qt STATIC ${wsjt_qt_CXXSRCS} ${wsjt_qt_GENUISRCS}
> ${GENAXSRCS})
> +
> # set wsjtx_udp exports to static variants
> target_compile_definitions (wsjt_qt PUBLIC UDP_STATIC_DEFINE)
> -target_link_libraries (wsjt_qt qcp Qt5::Widgets Qt5::Network)
> +target_link_libraries (wsjt_qt Qt5::SerialPort Qt5::Core qcp
> Qt5::Widgets Qt5::Network)
> target_include_directories (wsjt_qt BEFORE PRIVATE ${hamlib_INCLUDE_DIRS})
> +
> if (WIN32)
> target_link_libraries (wsjt_qt Qt5::AxContainer Qt5::AxBase)
> endif (WIN32)
> @@ -1343,11 +1347,18 @@
> )
> endif ()
> endif ()
> -qt5_use_modules (wsjtx SerialPort) # not sure why the interface link
> library syntax above doesn't work
>
> +
> +target_link_libraries(wsjtx Qt5::SerialPort Qt5::Core)
> +
> +
> +#qt5_use_modules (wsjtx SerialPort) # not sure why the interface link
> library #syntax above doesn't work
> +
> # make a library for WSJT-X UDP servers
> # add_library (wsjtx_udp SHARED ${UDP_library_CXXSRCS})
> add_library (wsjtx_udp-static STATIC ${UDP_library_CXXSRCS})
> +
> +
> #target_include_directories (wsjtx_udp
> # INTERFACE
> # $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/wsjtx>
> @@ -1356,6 +1367,7 @@
> INTERFACE
> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/wsjtx>
> )
> +
> #set_target_properties (wsjtx_udp PROPERTIES
> # PUBLIC_HEADER "${UDP_library_HEADERS}"
> # )
> @@ -1362,9 +1374,14 @@
> set_target_properties (wsjtx_udp-static PROPERTIES
> OUTPUT_NAME wsjtx_udp
> )
> +
> target_compile_definitions (wsjtx_udp-static PUBLIC UDP_STATIC_DEFINE)
> +
> #qt5_use_modules (wsjtx_udp Network)
> -qt5_use_modules (wsjtx_udp-static Network Gui)
> +#qt5_use_modules (wsjtx_udp-static Network Gui)
> +
> +target_link_libraries (wsjtx_udp-static Qt5::Core Qt5::Network Qt5::Gui)
> +
> generate_export_header (wsjtx_udp-static BASE_NAME udp)
>
> add_executable (udp_daemon UDPExamples/UDPDaemon.cpp
> UDPExamples/udp_daemon.rc ${WSJTX_ICON_FILE})
> @@ -1379,6 +1396,7 @@
> UDPExamples/message_aggregator.rc
> ${message_aggregator_RESOURCES_RCC}
> )
> +target_link_libraries (message_aggregator Qt5::Core wsjtx_udp-static)
> target_link_libraries (message_aggregator Qt5::Widgets wsjtx_udp-static)
>
> if (WSJT_CREATE_WINMAIN)
>
>
> On Thu, May 17, 2018 at 6:31 AM, Bill Somerville <[email protected]>
> wrote:
>
>> On 16/05/2018 13:34, Megan Woods wrote:
>>
>> Just a follow up, I got it to work with
>>
>> MacOSX SDK 10.13
>> Qt5-11-rc
>>
>> I had to update how the cmake file references the Qt modules.
>>
>> Hi Megan,
>>
>> what changes did you make to the CMake script?
>>
>> 73
>> Bill
>> G4WJS.
>>
>>
>> ------------------------------------------------------------------------------
>> Check out the vibrant tech community on one of the world's most
>> engaging tech sites, Slashdot.org! http://sdm.link/slashdot
>> _______________________________________________
>> wsjt-devel mailing list
>> [email protected]
>> https://lists.sourceforge.net/lists/listinfo/wsjt-devel
>>
>>
>
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
wsjt-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/wsjt-devel
