From 4eda25b9fb090d6e26e1469c6596a5e4f40dc40c Mon Sep 17 00:00:00 2001 From: Vincent Sonnier Date: Sun, 21 Mar 2021 10:24:21 +0100 Subject: [PATCH] Updated Windows instructions to remove need of setting CMAKE_INSTALL_PREFIX --- Build-Windows.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Build-Windows.md b/Build-Windows.md index 01bee6d..4ac9fd2 100644 --- a/Build-Windows.md +++ b/Build-Windows.md @@ -35,7 +35,7 @@ Download CMake from: For this guide I've used: -* https://github.com/Kitware/CMake/releases/download/v3.18.4/cmake-3.18.4-win64-x64.msi +* https://github.com/Kitware/CMake/releases/download/v3.18.4/cmake-3.20.0-win64-x64.msi # Install SoapySDR @@ -73,8 +73,8 @@ Copy the file `SoapySDR.dll` in the `C:\MSVCDev\CubicSDR_win64\x64` directory wh * Click Configure. * Choose "Visual Studio 16 2019" as `Specify the generator for this project` and "x64" as `Optional platform for generator` then click Finish. * Set wxWidgets_ROOT_DIR to `C:\MSVCDev\wxWidgets-3.1.4` -* Set wxWidgets_LIB_DIR to `C:\MSVCDev\wxWidgets-3.1.4\lib\vc_x64_lib` -* Set CMAKE_INSTALL_PREFIX to `C:/MSVCDev/SoapySDR_win64_install` +* Click "Configure" again +* Set SoapySDR_DIR to `C:/MSVCDev/SoapySDR_win64_install/cmake` * Click "Configure" again Configure variables to indicate CubicSDR that modules files will be searched in the `[CubicSDR executable]\modules` directory: @@ -87,9 +87,9 @@ Configure variables to indicate CubicSDR that modules files will be searched in * Click "Configure" again * Set USE_HAMLIB to 1 (checked) * Click "Configure" again -* Set HAMLIB_DLLS to `C:/MSVCDev/CubicSDR/external/hamlib/64/libhamlib-4.dll` +* Set HAMLIB_DLLS to `C:/MSVCDev/CubicSDR/external/hamlib/64/libhamlib-2.dll` * Set HAMLIB_INCLUDE_DIR to `C:/MSVCDev/CubicSDR/external/hamlib` -* Set HAMLIB_LIBRARY to `C:/MSVCDev/CubicSDR/external/hamlib/64/libhamlib-4.lib` +* Set HAMLIB_LIBRARY to `C:/MSVCDev/CubicSDR/external/hamlib/64/libhamlib-2.lib` * Click Configure again, all should be good, then Generate. * Navigate to `C:\MSVCDev\CubicSDR_win64` in Explorer and open `CubicSDR.sln`. * Once open select "Release" and "x64" build configuration and then "Build Solution" (F6) @@ -181,7 +181,7 @@ Copy the file `rtlsdr.dll` in the `C:\MSVCDev\CubicSDR_win64\x64` directory wher * Set destination to `C:/MSVCDev/SoapyRTLSDR_win64` * Click Configure. * Choose "Visual Studio 16 2019" as `Specify the generator for this project` and "x64" as `Optional platform for generator` then click Finish. -* Set CMAKE_INSTALL_PREFIX to `C:/MSVCDev/SoapySDR_win64_install` +* Set SoapySDR_DIR to `C:/MSVCDev/SoapySDR_win64_install/cmake` * Click "Configure" again * Set RTLSDR_INCLUDE_DIR to `C:/MSVCDev/librtlsdr/include` * Set RTLSDR_LIBRARY to `C:/MSVCDev/librtlsdr_win64/src/Release/rtlsdr.lib` @@ -196,7 +196,7 @@ C:\> cd C:\MSVCDev\ C:\MSVCDEV> cmake --build SoapyRTLSDR_win64 --config Release --target clean ... Bunch of messages ... 0 Error(s) -C:\MSVCDEV> cmake --build SoapyRTLSDR_win64 --config Release --target install +C:\MSVCDEV> cmake --build SoapyRTLSDR_win64 --config Release ... Bunch of building ... 0 Error(s) ``` @@ -209,7 +209,7 @@ Copy the generated module file `rtlsdrSupport.dll` in the `C:\MSVCDev\CubicSDR_w * Set destination to `C:/MSVCDev/SoapySDRPlay_win64` * Click Configure. * Choose "Visual Studio 16 2019" as `Specify the generator for this project` and "x64" as `Optional platform for generator` then click Finish. -* Set CMAKE_INSTALL_PREFIX to `C:\MSVCDev\SoapySDR_win64_install` +* Set SoapySDR_DIR to `C:/MSVCDev/SoapySDR_win64_install/cmake` * Click "Configure" again * Set LIBSDRPLAY_INCLUDE_DIRS to `C:\Program Files\SDRplay\API\inc` * Set LIBSDRPLAY_LIBRARIES to `C:\Program Files\SDRplay\API\x64\sdrplay_api.lib` @@ -224,7 +224,7 @@ C:\> cd C:\MSVCDev\ C:\MSVCDEV> cmake --build SoapySDRPlay_win64 --config Release --target clean ... Bunch of messages ... 0 Error(s) -C:\MSVCDEV> cmake --build SoapySDRPlay_win64 --config Release --target install +C:\MSVCDEV> cmake --build SoapySDRPlay_win64 --config Release ... Bunch of building ... 0 Error(s) ```