Merge branch 'master' into master

.github/workflows/cmake.yml

@@ -22,6 +22,21 @@ jobs:
     - name: Check diff
       run: git diff --exit-code
 
+  line-endings:
+
+    name: Line endings check
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Installing Dependencies
+      run: sudo apt-get update && sudo apt-get install dos2unix
+    - name: Convert to Unix line endings
+      run: dos2unix */*
+    - name: Check diff
+      run: git diff --exit-code
+
   build-ubuntu:
 
     name: Ubuntu ${{ matrix.os.name }} - ${{ matrix.compiler.name }}, ${{ matrix.portal.name }}, ${{ matrix.autoappend.name }}, ${{ matrix.shared_lib.name }}, C++${{ matrix.cppstd }}
@@ -33,7 +48,7 @@ jobs:
         portal: [ {flag: OFF, dep: libgtk-3-dev, name: GTK}, {flag: ON, dep: libdbus-1-dev, name: Portal} ] # The NFD_PORTAL setting defaults to OFF (i.e. uses GTK)
         autoappend: [ {flag: OFF, name: NoAppendExtn} ] # By default the NFD_PORTAL mode does not append extensions, because it breaks some features of the portal
         compiler: [ {c: gcc, cpp: g++, name: GCC}, {c: clang, cpp: clang++, name: Clang} ] # The default compiler is gcc/g++
-        cppstd: [23, 11]
+        cppstd: [20, 11]
         shared_lib: [ {flag: OFF, name: Static} ]
         include:
         - os: {label: ubuntu-latest, name: latest}
@@ -50,7 +65,7 @@ jobs:
           shared_lib: {flag: OFF, name: Static}
         - os: {label: ubuntu-latest, name: latest}
           portal: {flag: ON, dep: libdbus-1-dev, name: Portal}
-          autoappend: {flag: ON, name: NoAppendExtn}
+          autoappend: {flag: OFF, name: NoAppendExtn}
           compiler: {c: gcc, cpp: g++, name: GCC}
           cppstd: 11
           shared_lib: {flag: ON, name: Shared}

CMakeLists.txt

@@ -1,5 +1,5 @@
-cmake_minimum_required(VERSION 3.2)
-project(nfd VERSION 1.1.0)
+cmake_minimum_required(VERSION 3.5)
+project(nfd VERSION 1.1.1)
 
 set(nfd_ROOT_PROJECT OFF)
 if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)

README.md

@@ -110,16 +110,26 @@ Add `-DNFD_BUILD_TESTS=ON` to build sample programs and `-DNFD_INSTALL=ON` to en
 ## Standalone Library
 If you want to build the standalone static library,
 execute the following commands (starting from the project root directory):
+
+For GCC and Clang:
 ```
 mkdir build
 cd build
 cmake -DCMAKE_BUILD_TYPE=Release ..
 cmake --build .
 ```
 
+For MSVC:
+```
+mkdir build
+cd build
+cmake ..
+cmake --build . --config Release
+```
+
 The above commands will make a `build` directory,
 and build the project (in release mode) there.
-If you are developing NFDe, you may want to do `-DCMAKE_BUILD_TYPE=Debug`
+If you are developing NFDe, you may want to do `-DCMAKE_BUILD_TYPE=Debug`/`--config Debug`
 to build a debug version of the library instead.
 
 When building as a standalone library, sample programs are built and the install target is enabled by default.