Merge pull request #56 from JanCaha/development

Development

Author: JanCaha

.github/workflows/conda_build.yaml

@@ -92,55 +92,3 @@ jobs:
         with:
           path: conda_package/linux-64/*.conda 
           name: conda_package_linux
-
-  # Build-on-Windows:
-
-  #   name: Build on Windows
-    
-  #   runs-on: windows-latest
-    
-  #   needs: Update-conda-package-version
-
-  #   env:
-  #     GH_TOKEN: ${{ github.token }}
-  #     LIBARCHIVE: C:\Miniconda\Library\bin\archive.dll
-
-  #   steps:
-      
-  #     - name: Setup MSVC
-  #       uses: ilammy/msvc-dev-cmd@v1
-
-  #     - name: Checkout
-  #       uses: actions/checkout@v4
-  #       with:
-  #         submodules: true
-  
-  #     - uses: conda-incubator/setup-miniconda@v3
-  #       with:
-  #         auto-update-conda: true
-  #         use-mamba: true
-  #         channels: conda-forge,defaults
-  #         auto-activate-base: true
-  #         activate-environment: ""
-      
-  #     - name: Add Custom Conda Channel
-  #       run: |
-  #         conda config --add channels https://jancaha.github.io/conda-channel
-    
-  #     - name: Install conda-build
-  #       run: |
-  #         conda install -n base conda-build conda-verify
-
-  #     - name: Install libsimplerasters
-  #       run: |
-  #         conda install -n base libsimplerasters
-
-  #     - name: Build library
-  #       run: |
-  #         conda build conda --output-folder conda_package
-      
-  #     - name: Upload artifact   
-  #       uses: actions/upload-artifact@v4
-  #       with:
-  #         path: conda_package/win-64/*.conda
-  #         name: conda_package_windows

.github/workflows/create_releases.yaml

@@ -91,7 +91,9 @@ jobs:
               -DBUILD_TESTS:bool=on \
               -DCELL_EVENT_DATA_FLOAT:bool=on \
               -DOUTPUT_RASTER_DATA_FLOAT:bool=on \
-              -D CMAKE_INSTALL_PREFIX=/usr
+              -DBUILD_GUI_APP:bool=on \
+              -DNEEDS_QT:bool=on \
+              -DCMAKE_INSTALL_PREFIX=/usr
 
         - name: Build DEB
           run: | 

.github/workflows/test_library.yaml

@@ -57,8 +57,8 @@ jobs:
         run: | 
           mkdir build
           cmake \
-            -S. \
-            -Bbuild \
+            -S . \
+            -B build \
             -G Ninja \
             -DCMAKE_CXX_COMPILER=${COMPILER} \
             -DCMAKE_BUILD_TYPE=Release \
@@ -67,7 +67,8 @@ jobs:
             -DBUILD_TESTS:bool=on \
             -DCELL_EVENT_DATA_FLOAT:bool=on \
             -DOUTPUT_RASTER_DATA_FLOAT:bool=on \
-            -DNEEDS_QT:bool=off
+            -DNEEDS_QT:bool=off \
+            -DBUILD_GUI_APP:bool=off
 
       - name: Build
         run: | 
@@ -88,8 +89,8 @@ jobs:
         id: unittestsdouble
         run: |
           cmake \
-            -S. \
-            -Bbuild \
+            -S . \
+            -B build \
             -G Ninja \
             -DCMAKE_CXX_COMPILER=${COMPILER} \
             -DCMAKE_BUILD_TYPE=Release \
@@ -98,7 +99,8 @@ jobs:
             -DBUILD_TESTS:bool=on \
             -DCELL_EVENT_DATA_FLOAT:bool=off \
             -DOUTPUT_RASTER_DATA_FLOAT:bool=off \
-            -DNEEDS_QT:bool=off
+            -DNEEDS_QT:bool=off \
+            -DBUILD_GUI_APP:bool=off
           cmake --build build --config Release --target build_tests
           cmake --build build --config Release --target run_tests
 
@@ -150,7 +152,7 @@ jobs:
       - name: Configure
         run: | 
           cmake \
-            -S. \
+            -S . \
             -Bbuild \
             -G Ninja \
             -DCMAKE_CXX_COMPILER=${COMPILER} \
@@ -161,7 +163,8 @@ jobs:
             -DCELL_EVENT_DATA_FLOAT:bool=on \
             -DOUTPUT_RASTER_DATA_FLOAT:bool=on \
             -DNEEDS_QT:bool=on \
-            -D CMAKE_INSTALL_PREFIX=/usr
+            -DBUILD_GUI_APP:bool=on \
+            -DCMAKE_INSTALL_PREFIX=/usr \
       
       - name: Run Tests even with Qt
         id: unittestsqt

CMakeLists.txt

@@ -11,9 +11,14 @@ option(BUILD_TESTS "Build tests." ON)
 option(BUILD_DOCUMENTATION "Build documentation." OFF)
 option(PACK_DEB "Pack DEB file for installation in Debian/Ubuntu/Mint and derivatives." ON)
 option(NEEDS_QT "Allows optionally building library without searching for Qt. Cannot build binaries with this set to OFF. For running test mainly." ON)
+option(BUILD_GUI_APP "Allows building of executable program with GUI" ON)
 option(CELL_EVENT_DATA_FLOAT "Create CellEvents with data stored `float` instead of `double`. Lowers significantly RAM memory usage." ON)
 option(OUTPUT_RASTER_DATA_FLOAT "Create output rasters with data stored `Float32` instead of `Float64`. Lowers RAM memory usage." ON)
 
+if(BUILD_GUI_APP)
+    set(NEEDS_QT ON)
+endif()
+
 # C++ Standard
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -29,20 +34,30 @@ find_package(SimpleRasters REQUIRED)
 if(NEEDS_QT)
     set(CMAKE_AUTOMOC TRUE)
 
-    find_package(Qt5 COMPONENTS Core Widgets Xml Gui Test REQUIRED)
+    find_package(Qt5 COMPONENTS Core Xml Test REQUIRED)
 
     set(QT_INCLUDES
         ${Qt5Core_INCLUDE_DIRS}
-        ${Qt5Widgets_INCLUDE_DIRS}
-        ${Qt5Gui_INCLUDE_DIRS}
     )
 
     set(QT_LIBS
         Qt5::Core
-        Qt5::Gui
-        Qt5::Widgets
     )
 
+    if(BUILD_GUI_APP)
+        find_package(Qt5 COMPONENTS Core Widgets Xml Gui Test REQUIRED)
+
+        set(QT_INCLUDES
+            ${Qt5Core_INCLUDE_DIRS}
+        )
+
+        set(QT_LIBS
+            ${QT_LIBS}
+            Qt5::Gui
+            Qt5::Widgets
+        )
+    endif()
+
     set(HAS_QT TRUE)
 else()
     message(STATUS "Not using Qt")
@@ -128,11 +143,20 @@ install(TARGETS library_viewshed
 
 if(HAS_QT)
     install(TARGETS
-        viewshed inverseviewshed viewshedcalculator losextractor viewshed_widgets
+        viewshed inverseviewshed
         COMPONENT bin
         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
     )
+
+    if(BUILD_GUI_APP)
+        install(TARGETS
+            viewshedcalculator losextractor viewshed_widgets
+            COMPONENT bin
+            RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+            LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        )
+    endif()
 endif()
 
 # endif()

cmake/CondaInstall.cmake

@@ -7,25 +7,38 @@ source:
 
 build:
   number: 0
+  skip: true  # [win]
   script:
-    - cmake ${CMAKE_ARGS} -B build -S {{SRC_DIR}} -G Ninja -DCMAKE_BUILD_TYPE=Release -DPACK_DEB:bool=off -DBUILD_DOCUMENTATION:bool=off -DBUILD_TESTS:bool=off -DCELL_EVENT_DATA_FLOAT:bool=on -DOUTPUT_RASTER_DATA_FLOAT:bool=on -DNEEDS_QT:bool=off
+    - cmake ${CMAKE_ARGS} -B build -S {{SRC_DIR}} -G Ninja -DCMAKE_BUILD_TYPE=Release -DPACK_DEB:bool=off -DBUILD_DOCUMENTATION:bool=off -DBUILD_TESTS:bool=off -DCELL_EVENT_DATA_FLOAT:bool=on -DOUTPUT_RASTER_DATA_FLOAT:bool=on -DNEEDS_QT:bool=on -DBUILD_GUI_APP:bool=off
     - cmake --build build --config Release 
     - cmake --install build --prefix {{PREFIX}}
 
+test:
+  requires:
+    - bash 
+  commands:
+    - test -f "${PREFIX}/lib/libviewshed.so"
+    - test -f "${PREFIX}/include/viewshed/viewshed.h"
+    - test -x "${PREFIX}/bin/viewshed"
+    - test -x "${PREFIX}/bin/inverseviewshed"
+
 requirements:
   build:
     - {{ compiler('c') }}
     - {{ compiler('cxx') }}
     - pthread-stubs
     - libgdal
     - libsimplerasters
+    - qt-main 5.*
   host:
     - pthread-stubs
     - libgdal
     - libsimplerasters
+    - qt-main 5.*
   run:
     - libgdal
     - libsimplerasters
+    - qt-main 5.*
 
 about:
   home: https://github.com/JanCaha/cpp-viewshed-library

conda/meta.yaml

@@ -12,7 +12,8 @@ cmake \
     -D CELL_EVENT_DATA_FLOAT:bool=on \
     -D OUTPUT_RASTER_DATA_FLOAT:bool=on \
     -D CMAKE_INSTALL_PREFIX=/usr \
-    -D NEEDS_QT:bool=on
+    -D NEEDS_QT:bool=on \
+    -D BUILD_GUI_APP:bool=on
 
 cmake --build build --config Release --target library_viewshed
 cmake --build build --config Release --target create_binaries

scripts/install.sh

@@ -1,5 +1,7 @@
 # Binaries :
-macro(create_binary bin_name filename add_widgets)
+add_custom_target(create_binaries)
+
+macro(create_binary bin_name filename)
     add_executable(${bin_name} ${filename} commandlinehelper.h)
 
     set_target_properties(${bin_name} PROPERTIES AUTOMOC TRUE)
@@ -9,58 +11,60 @@ macro(create_binary bin_name filename add_widgets)
     target_include_directories(${bin_name} PRIVATE ${QT_INCLUDES})
     target_include_directories(${bin_name} PRIVATE ${GDAL_INCLUDE_DIR})
     target_include_directories(${bin_name} PRIVATE SimpleRasters::SimpleRasters)
-    target_include_directories(${bin_name} PRIVATE viewshed_widgets)
 
     target_link_libraries(${bin_name}
         ${QT_LIBS}
         bs_thread_pool
         library_viewshed
         ${GDAL_LIBRARY}
         SimpleRasters::SimpleRasters
-        viewshed_widgets
     )
+
+    add_dependencies(create_binaries ${bin_name})
 endmacro(create_binary)
 
-if(HAS_QT)
-    message(STATUS "Has Qt so binaries can be build.")
+macro(create_gui_binary bin_name filename)
+    create_binary(${bin_name} ${filename})
 
-    add_library(viewshed_widgets SHARED
-        pointwidget.h pointwidget.cpp
-        doublevalidator.h doublevalidator.cpp
-        fileselectorwidget.h fileselectorwidget.cpp
-        viewshedcalculatorwindow.h viewshedcalculatorwindow.cpp)
+    target_include_directories(${bin_name} PRIVATE viewshed_widgets)
+    target_link_libraries(${bin_name} viewshed_widgets)
+endmacro(create_gui_binary)
 
-    set_target_properties(viewshed_widgets PROPERTIES OUTPUT_NAME "viewshedwidgets")
+if(HAS_QT)
+    message(STATUS "Has Qt so binaries can be build.")
 
-    set_target_properties(viewshed_widgets PROPERTIES VERSION ${PROJECT_VERSION})
+    create_binary(viewshed viewshed.cpp)
 
-    target_include_directories(viewshed_widgets PUBLIC ${QT_INCLUDES})
-    target_include_directories(viewshed_widgets PUBLIC SimpleRasters::SimpleRasters)
-    target_include_directories(viewshed_widgets PRIVATE ${GDAL_INCLUDE_DIR})
+    create_binary(inverseviewshed inverseviewshed.cpp)
 
-    target_link_libraries(viewshed_widgets
-        ${QT_LIBS}
-        library_viewshed
-        ${GDAL_LIBRARY}
-        SimpleRasters::SimpleRasters
+    add_dependencies(create_binaries
+        viewshed
+        inverseviewshed
     )
 
-    create_binary(viewshed viewshed.cpp OFF)
+    if(BUILD_GUI_APP)
+        add_library(viewshed_widgets SHARED
+            pointwidget.h pointwidget.cpp
+            doublevalidator.h doublevalidator.cpp
+            fileselectorwidget.h fileselectorwidget.cpp
+            viewshedcalculatorwindow.h viewshedcalculatorwindow.cpp)
 
-    create_binary(inverseviewshed inverseviewshed.cpp OFF)
+        set_target_properties(viewshed_widgets PROPERTIES OUTPUT_NAME "viewshedwidgets")
 
-    create_binary(viewshedcalculator viewshedcalculator.cpp ON)
+        set_target_properties(viewshed_widgets PROPERTIES VERSION ${PROJECT_VERSION})
 
-    create_binary(losextractor losextractor.cpp ON)
+        target_include_directories(viewshed_widgets PUBLIC ${QT_INCLUDES})
+        target_include_directories(viewshed_widgets PUBLIC SimpleRasters::SimpleRasters)
+        target_include_directories(viewshed_widgets PRIVATE ${GDAL_INCLUDE_DIR})
 
-    add_custom_target(create_binaries)
+        target_link_libraries(viewshed_widgets
+            ${QT_LIBS}
+            library_viewshed
+            ${GDAL_LIBRARY}
+            SimpleRasters::SimpleRasters
+        )
 
-    add_dependencies(create_binaries viewshed)
-
-    add_dependencies(create_binaries
-        viewshed
-        inverseviewshed
-        viewshedcalculator
-        losextractor
-    )
+        create_gui_binary(viewshedcalculator viewshedcalculator.cpp)
+        create_gui_binary(losextractor losextractor.cpp)
+    endif()
 endif()