Update nanogui

.gitmodules

@@ -7,3 +7,6 @@
 [submodule "external/portaudio"]
 	path = external/portaudio
 	url = https://git.assembla.com/portaudio.git
+[submodule "external/nanogui"]
+	path = external/nanogui
+	url = https://github.com/Godzil/nanogui.git

.travis.yml

@@ -1,4 +1,11 @@
+dist: trusty
 language: c
+os:
+  - linux
+  - osx
+#matrix:
+#  allow_failures:
+#    - os: osx
 
 addons:
   apt:
@@ -7,76 +14,40 @@ addons:
       - curl
       - xorg-dev
       - libglu1-mesa-dev
+#  sonarcloud:
+#    organisation: "godzil-github"
+#    token: ${SONARCLOUD_TOKEN}
+
+compiler:
+  - clang
+  - gcc
 
 script:
   - mkdir build
   - cd build
   - cmake -DUSE_ALLEGRO=OFF -DUSE_PROFILING=OFF -DCOVERALLS=OFF -DCMAKE_BUILD_TYPE=Release ..
   - cmake --build .
+  - cd ..
+#  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then mkdir sonar; cd sonar; cmake -DUSE_ALLEGRO=OFF -DUSE_PROFILING=OFF -DCOVERALLS=OFF -DCMAKE_BUILD_TYPE=Release ..; fi
+#  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then make clean ; fi
+#  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then build-wrapper-linux-x86-64 --out-dir bw-output cmake --build . ; fi
+#  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cd .. ; fi
+#  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sonar-scanner -Dsonar.login=$SONARCLOUD_TOKEN; fi
+  - mkdir coverage
+  - cd coverage
+  - cmake -DUSE_ALLEGRO=OFF -DUSE_PROFILING=OFF -DCOVERALLS=ON -DCMAKE_BUILD_TYPE=Debug ..
+  - cmake --build .
+  - cmake --build . --target coveralls
+
+cache:
+  directories:
+    - '$HOME/.sonar/cache'
 
 before_install:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update      ; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install glew; fi
 
-jobs:
+install: true
-  include:
-    - os: linux
-      dist: bionic
-      arch: amd64
-      compiler: gcc
 
-    - os: linux
+after_success:
-      dist: bionic
+  - bash <(curl -s https://codecov.io/bash)
-      arch: amd64
-      compiler: clang
-
-    - os: linux
-      dist: focal
-      arch: amd64
-      compiler: gcc
-
-    - os: linux
-      dist: focal
-      arch: amd64
-      compiler: clang
-
-    - os: osx
-      compiler: clang
-      osx_image: xcode12.2
-
-    - os: linux
-      dist: focal
-      arch: arm64
-      compiler: gcc
-
-    - os: osx
-      compiler: clang
-      osx_image: xcode10.3
-
-    - os: osx
-      compiler: clang
-      osx_image: xcode11.6
-
-    - os: osx
-      compiler: clang
-      osx_image: xcode12
-      
-    - stage: "Coverage"
-      os: linux
-      dist: bionic
-      arch: amd64
-      compiler: gcc
-      script:
-        - mkdir coverage
-        - cd coverage
-        - cmake -DUSE_ALLEGRO=OFF -DUSE_PROFILING=OFF -DCOVERALLS=ON -DCMAKE_BUILD_TYPE=Debug ..
-        - cmake --build .
-        - cmake --build . --target coveralls
-      after_success:
-        - bash <(curl -s https://codecov.io/bash)
-
-  allow_failures:
-    - os: linux
-      arch: arm64
-
-    - os: osx

external/nanogui

@@ -0,0 +1 @@
+Subproject commit 16bc6b1d3ac565f9d96889040c8fd9e6ad4a1a16

src/CMakeLists.txt

@@ -19,19 +19,12 @@ set(USE_ALLEGRO ON CACHE BOOL "Use Allegro backend")
 
 option(COVERALLS "Generate coveralls data" OFF)
 
-option(WARN_AS_ERROR "Enable warning as error" OFF)
-
 ##########################
 # Link & Compile flags
 ##########################
 
-set(COMP_FLAGS "-march=native -Wall -Wextra -Wno-unused-parameter -Wno-unused-result -Wno-write-strings ${PLATFORM_FLAGS}")
+set(CMAKE_C_FLAGS "-Wall -Wextra -Wno-unused-parameter -Wno-unused-result -Werror ${PLATFORM_FLAGS}")
-if (WARN_AS_ERROR)
+set(CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-unused-parameter -Wno-unused-result -Werror ${PLATFORM_FLAGS}")
-    set(COMP_FLAGS "${COMP_FLAGS} -Werror")
-endif()
-
-set(CMAKE_C_FLAGS ${COMP_FLAGS})
-set(CMAKE_CXX_FLAGS ${COMP_FLAGS})
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/external/coveralls-cmake/cmake)