NTIA · dirkcgrunwald · Nov 30, 2022 · Nov 30, 2022 · Nov 30, 2022 · Dec 1, 2022
diff --git a/.github/workflows/compile-and-test.yml b/.github/workflows/compile-and-test.yml
@@ -0,0 +1,64 @@
+name: Compile and test Release & Debug builds
+# using https://levelup.gitconnected.com/utilizing-github-actions-to-build-and-test-on-multiple-platforms-a7fe3aa6ce2a
+
+on:
+  push:
+    branches: [ PR_cmake ]
+
+  pull_request:
+    branches: [ PR_cmake ]
+
+  workflow_dispatch:
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  build_and_test:
+    name: >
+      Build and test a ${{ matrix.build }} version of ITM on
+      ${{ matrix.os }} with ${{ matrix.compiler }}.
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest]
+        compiler: [ g++-10 ]
+        build: [Release]
+        include:
+          - os: ubuntu-latest
+            target: Linux
+          # - os: macos-latest
+          #   target: Macos
+          - os: windows-latest
+            compiler: cl
+            target: Windows
+            build: Release
+          # # - os: windows-latest
+          #   compiler: cl
+          #   target: Windows
+          #   build: Debug
+
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+
+      - name: Linux/MacOS compile
+        if: ${{ matrix.os != 'windows-latest' }}
+        uses: lukka/run-cmake@v3
+        with:
+          cmakeListsTxtPath: '${{ github.workspace }}/CMakeLists.txt'
+          buildDirectory: "${{ github.workspace }}/build"
+          buildWithCMake: true
+
+      - name: Add msbuild to PATH
+        if: ${{ matrix.os == 'windows-latest' }}
+        uses: microsoft/[email protected]
+
+      - name: Compile for Windows
+        if: ${{ matrix.os == 'windows-latest' }}
+        uses: lukka/run-cmake@v3
+        with:
+          cmakeListsTxtPath: '${{ github.workspace }}/CMakeLists.txt'
+          buildDirectory: "${{ github.workspace }}/build"
+          buildWithCMake: true
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -0,0 +1,78 @@
+#
+# Cmake for a shared library using directions at https://stackoverflow.com/questions/17511496/how-to-create-a-shared-library-with-cmake
+#
+cmake_minimum_required(VERSION 3.16)
+
+project(itmlib VERSION 1.3 DESCRIPTION "NTIA Irregular Terrain Model library")
+
+SET(itmlib_SRC
+    src/ComputeDeltaH.cpp
+    src/DiffractionLoss.cpp
+    src/FindHorizons.cpp
+    src/FreeSpaceLoss.cpp
+    src/FresnelIntegral.cpp
+    src/H0Function.cpp
+    src/InitializeArea.cpp
+    src/InitializePointToPoint.cpp
+    src/InverseComplementaryCumulativeDistributionFunction.cpp
+    src/itm_area.cpp
+    src/itm_p2p.cpp
+    src/KnifeEdgeDiffraction.cpp
+    src/LinearLeastSquaresFit.cpp
+    src/LineOfSightLoss.cpp
+    src/LongleyRice.cpp
+    src/QuickPfl.cpp
+    src/SigmaHFunction.cpp
+    src/SmoothEarthDiffraction.cpp
+    src/TerrainRoughness.cpp
+    src/TroposcatterLoss.cpp
+    src/ValidateInputs.cpp
+    src/Variability.cpp
+)
+
+set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS YES CACHE BOOL "Export all symbols")
+
+#
+# run cmake -DBUILD_SHARED_LIBS=ON if you want shared libs
+# See https://cgold.readthedocs.io/en/latest/tutorials/libraries/static-shared.html
+#
+add_library(itmlib ${itmlib_SRC})
+
+set_target_properties(itmlib PROPERTIES VERSION ${PROJECT_VERSION})
+set_target_properties(itmlib PROPERTIES SOVERSION 0)
+add_compile_definitions(
+    ITMLIB_VERSION="${PROJECT_VERSION}.0")
+
+# Use C++14 -- needed because of initializers
+set_property(TARGET itmlib PROPERTY CXX_STANDARD 14)
+
+set_target_properties(itmlib PROPERTIES PUBLIC_HEADER include/itm.h)
+set_target_properties(itmlib PROPERTIES PUBLIC_HEADER include/Enums.h)
+set_target_properties(itmlib PROPERTIES PUBLIC_HEADER include/Errors.h)
+set_target_properties(itmlib PROPERTIES PUBLIC_HEADER include/Warnigns.h)
+
+# Only Cmake 3.20+ provides platform independent way to construct paths
+IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER_EQUAL 3.20)
+    cmake_path(APPEND itminclude "${CMAKE_SOURCE_DIR}" "include")
+ELSE (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER_EQUAL 3.20)
+    set(itminclude "${CMAKE_SOURCE_DIR}/include")
+ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER_EQUAL 3.20)
+
+#
+# inclue the include directory
+#
+target_include_directories(itmlib PRIVATE ${itminclude})
+
+include(GNUInstallDirs)
+install(TARGETS itmlib
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/itmlib
+    )
+
+# pkg_check_modules()
+
+configure_file(itmlib.pc.in itmlib.pc @ONLY)
+
+install(FILES ${CMAKE_BINARY_DIR}/itmlib.pc DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig)
+
+add_subdirectory(win32/ITMDrvr)
diff --git a/include/itm.h b/include/itm.h
@@ -7,7 +7,11 @@
 using namespace std;
 
 // Export the DLL functions as "C" and not C++
-#define DLLEXPORT extern "C" __declspec(dllexport)
+#ifdef _WIN32
+#  define DLLEXPORT extern "C" __declspec(dllexport)
+#else
+#  define DLLEXPORT extern "C"
+#endif
 #define MAX(x, y) (((x) > (y)) ? (x) : (y))
 #define MIN(x, y) (((x) < (y)) ? (x) : (y))
 #define DIM(x, y) (((x) > (y)) ? (x - y) : (0))

diff --git a/itmlib.pc.in b/itmlib.pc.in
@@ -0,0 +1,12 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=@CMAKE_INSTALL_PREFIX@
+libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@
+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
+
+Name: @PROJECT_NAME@
+Description: @PROJECT_DESCRIPTION@
+Version: @PROJECT_VERSION@
+
+Requires:
+Libs: -L${libdir} -litmlib
+Cflags: -I${includedir}
diff --git a/src/ComputeDeltaH.cpp b/src/ComputeDeltaH.cpp
@@ -1,4 +1,4 @@
-#include "..\include\itm.h"
+#include "itm.h"
 
 /*=============================================================================
  |

diff --git a/src/DiffractionLoss.cpp b/src/DiffractionLoss.cpp
@@ -1,4 +1,4 @@
-#include "..\include\itm.h"
+#include "itm.h"
 
 /*=============================================================================
  |

diff --git a/src/FindHorizons.cpp b/src/FindHorizons.cpp
@@ -1,4 +1,4 @@
-#include "..\include\itm.h"
+#include "itm.h"
 
 /*=============================================================================
  |

diff --git a/src/FreeSpaceLoss.cpp b/src/FreeSpaceLoss.cpp
@@ -1,4 +1,4 @@
-#include "..\include\itm.h"
+#include "itm.h"
 
 /*=============================================================================
  |

diff --git a/src/FresnelIntegral.cpp b/src/FresnelIntegral.cpp
@@ -1,4 +1,4 @@
-#include "..\include\itm.h"
+#include "itm.h"
 
 /*=============================================================================
  |

diff --git a/src/H0Function.cpp b/src/H0Function.cpp
@@ -1,4 +1,4 @@
-#include "..\include\itm.h"
+#include "itm.h"
 
 /*=============================================================================
  |

diff --git a/src/InitializeArea.cpp b/src/InitializeArea.cpp
@@ -1,5 +1,5 @@
-#include "..\include\itm.h"
-#include "..\include\Enums.h"
+#include "itm.h"
+#include "Enums.h"
 
 /*=============================================================================
  |

diff --git a/src/InitializePointToPoint.cpp b/src/InitializePointToPoint.cpp
@@ -1,5 +1,5 @@
-#include "..\include\itm.h"
-#include "..\include\Enums.h"
+#include "itm.h"
+#include "Enums.h"
 
 /*=============================================================================
  |

diff --git a/src/InverseComplementaryCumulativeDistributionFunction.cpp b/src/InverseComplementaryCumulativeDistributionFunction.cpp
@@ -1,4 +1,4 @@
-#include "..\include\itm.h"
+#include "itm.h"
 
 /*=============================================================================
  |

diff --git a/src/KnifeEdgeDiffraction.cpp b/src/KnifeEdgeDiffraction.cpp
@@ -1,4 +1,4 @@
-#include "..\include\itm.h"
+#include "itm.h"
 
 /*=============================================================================
  |

diff --git a/src/LineOfSightLoss.cpp b/src/LineOfSightLoss.cpp
@@ -1,4 +1,4 @@
-#include "..\include\itm.h"
+#include "itm.h"
 
 /*=============================================================================
  |

diff --git a/src/LinearLeastSquaresFit.cpp b/src/LinearLeastSquaresFit.cpp
@@ -1,4 +1,4 @@
-#include "..\include\itm.h"
+#include "itm.h"
 
 /*=============================================================================
  |

diff --git a/src/LongleyRice.cpp b/src/LongleyRice.cpp
@@ -1,7 +1,7 @@
-#include "..\include\itm.h"
-#include "..\include\Enums.h"
-#include "..\include\Errors.h"
-#include "..\include\Warnings.h"
+#include "itm.h"
+#include "Enums.h"
+#include "Errors.h"
+#include "Warnings.h"
 
 /*=============================================================================
  |

diff --git a/src/QuickPfl.cpp b/src/QuickPfl.cpp
@@ -1,4 +1,4 @@
-#include "..\include\itm.h"
+#include "itm.h"
 
 /*=============================================================================
  |

diff --git a/src/SigmaHFunction.cpp b/src/SigmaHFunction.cpp
@@ -1,4 +1,4 @@
-#include "..\include\itm.h"
+#include "itm.h"
 
 /*=============================================================================
  |

diff --git a/src/SmoothEarthDiffraction.cpp b/src/SmoothEarthDiffraction.cpp
@@ -1,4 +1,4 @@
-#include "..\include\itm.h"
+#include "itm.h"
 
 /*=============================================================================
  |

diff --git a/src/TerrainRoughness.cpp b/src/TerrainRoughness.cpp
@@ -1,4 +1,4 @@
-#include "..\include\itm.h"
+#include "itm.h"
 
 /*=============================================================================
  |

diff --git a/src/TroposcatterLoss.cpp b/src/TroposcatterLoss.cpp
@@ -1,4 +1,4 @@
-#include "..\include\itm.h"
+#include "itm.h"
 
 /*=============================================================================
  |

diff --git a/src/ValidateInputs.cpp b/src/ValidateInputs.cpp
@@ -1,7 +1,7 @@
-#include "..\include\itm.h"
-#include "..\include\Enums.h"
-#include "..\include\Errors.h"
-#include "..\include\Warnings.h"
+#include "itm.h"
+#include "Enums.h"
+#include "Errors.h"
+#include "Warnings.h"
 
 /*=============================================================================
  |

diff --git a/src/Variability.cpp b/src/Variability.cpp
@@ -1,6 +1,6 @@
-#include "..\include\itm.h"
-#include "..\include\Enums.h"
-#include "..\include\Warnings.h"
+#include "itm.h"
+#include "Enums.h"
+#include "Warnings.h"
 
 /*=============================================================================
  |

diff --git a/src/itm_area.cpp b/src/itm_area.cpp
@@ -1,6 +1,6 @@
-#include "..\include\itm.h"
-#include "..\include\Enums.h"
-#include "..\include\Errors.h"
+#include "itm.h"
+#include "Enums.h"
+#include "Errors.h"
 
 /*=============================================================================
  |

diff --git a/src/itm_p2p.cpp b/src/itm_p2p.cpp
@@ -1,6 +1,6 @@
-#include "..\include\itm.h"
-#include "..\include\Enums.h"
-#include "..\include\Errors.h"
+#include "itm.h"
+#include "Enums.h"
+#include "Errors.h"
 
 /*=============================================================================
  |