CMake cleanup (#2489)

* CMake Cleanup * Warning suppression with CEF * Use SGCT tinyxml in skybrowser for now * Disable warnings about missing field initializers
2026-02-21 12:29:04 -06:00 · 2023-02-05 23:24:12 +01:00
parent dfc62e44a6
commit 79ad5776cc
83 changed files with 608 additions and 6050 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,8 +22,8 @@
 # OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                          #
 ##########################################################################################

-cmake_minimum_required(VERSION 3.10 FATAL_ERROR)
-cmake_policy(SET CMP0120 NEW)
+cmake_minimum_required(VERSION 3.25 FATAL_ERROR)
+cmake_policy(VERSION 3.25)

 project(OpenSpace)

@@ -32,18 +32,12 @@ set(OPENSPACE_VERSION_MINOR 19)
 set(OPENSPACE_VERSION_PATCH 0)
 set(OPENSPACE_VERSION_STRING "<dev>")

-set(OPENSPACE_BASE_DIR "${PROJECT_SOURCE_DIR}")
-set(OPENSPACE_CMAKE_EXT_DIR "${OPENSPACE_BASE_DIR}/support/cmake")
-set(GHOUL_BASE_DIR "${OPENSPACE_BASE_DIR}/ext/ghoul")
-
-include(${OPENSPACE_CMAKE_EXT_DIR}/module_common.cmake)
-include(${GHOUL_BASE_DIR}/support/cmake/copy_shared_libraries.cmake)
-include(${GHOUL_BASE_DIR}/support/cmake/handle_external_library.cmake)
-include(${GHOUL_BASE_DIR}/support/cmake/message_macros.cmake)
+include(${PROJECT_SOURCE_DIR}/support/cmake/module_common.cmake)
+include(${PROJECT_SOURCE_DIR}/ext/ghoul/support/cmake/message_macros.cmake)

 begin_header("Configuring OpenSpace project")

-# Bail out if the user tries to generate a 32 bit project.
+# Bail out if the user tries to generate a 32 bit project
 if (NOT ${CMAKE_SIZEOF_VOID_P} EQUAL 8)
  message(FATAL_ERROR "OpenSpace can only be generated for 64 bit architectures.")
 endif ()
@@ -51,9 +45,7 @@ endif ()
 ##########################################################################################
 # Cleanup project                                                                        #
 ##########################################################################################
-set(OPENSPACE_APPS_DIR "${OPENSPACE_BASE_DIR}/apps")
-
-if (NOT EXISTS "${OPENSPACE_BASE_DIR}/ext/ghoul/CMakeLists.txt")
+if (NOT EXISTS "${PROJECT_SOURCE_DIR}/ext/ghoul/CMakeLists.txt")
  message(FATAL_ERROR "Git submodules are missing. Please run "
    "git submodule update --init --recursive to download the missing dependencies."
  )
@@ -68,11 +60,13 @@ mark_as_advanced(CMAKE_BACKWARDS_COMPATIBILITY CMAKE_BUILD_TYPE CMAKE_DEBUG_POST
 )

 # Set build output directories
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${OPENSPACE_CMAKE_EXT_DIR})
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${OPENSPACE_BASE_DIR}/bin)
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/support/cmake)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin)

-# "OpenSpace Helper" is not a valid CMake target name under OLD
-cmake_policy(SET CMP0037 NEW)
+if (MSVC)
+  # Force all builds to be multi-threaded and increase number of sections in obj files
+  add_definitions(/MP /bigobj)
+endif ()

 ##########################################################################################
 # Main                                                                                   #
@@ -106,8 +100,6 @@ else ()
  set(OPENSPACE_GIT_STATUS "")
 endif ()

-option(OPENSPACE_WARNINGS_AS_ERRORS "Treat warnings as errors" OFF)
-
 if (MSVC)
  option(OPENSPACE_BREAK_ON_FLOATING_POINT_EXCEPTION "Raise exceptions when encountering Inf's or Nan's in floating point numbers" OFF)

@@ -134,31 +126,26 @@ if (MSVC)
  set(GHOUL_OPTIMIZATION_ENABLE_OTHER_OPTIMIZATIONS ${OPENSPACE_OPTIMIZATION_ENABLE_OTHER_OPTIMIZATIONS} CACHE BOOL "" FORCE)
 endif ()

-if (UNIX)
-  if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -stdlib=libc++")
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -stdlib=libc++ -lc++ -lc++abi")
-  else ()
-    if (NOT CMAKE_BUILD_TYPE)
-      #Can set to "RelWithDebInfo" or "Debug" also, but problems occur if this is blank by default
-      set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Default build type" FORCE)
-    endif ()
-    if (NOT DEFINED CMAKE_CXX_FLAGS OR CMAKE_CXX_FLAGS MATCHES "")
-      set(CMAKE_CXX_FLAGS " ")
-    endif ()
-    STRING(FIND ${CMAKE_CXX_FLAGS} "GLM_ENABLE_EXPERIMENTAL" GLM_FLAG_POS)
-    if (${GLM_FLAG_POS} EQUAL -1)
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DGLM_ENABLE_EXPERIMENTAL" CACHE STRING "" FORCE)
-    endif ()
-    set(OpenGL_GL_PREFERENCE "GLVND" CACHE STRING "OpenGL Preference setting necessary for linux" FORCE)
-    #Fix for gcc tolerating space in target name
-    if (NOT DEFINED CMAKE_C_FLAGS OR CMAKE_C_FLAGS MATCHES "")
-      set(CMAKE_C_FLAGS " ")
-    endif ()
-    STRING(FIND ${CMAKE_C_FLAGS} "_GNU_SOURCE" GNUSOURCE_FLAG_POS)
-    if (${GNUSOURCE_FLAG_POS} EQUAL -1)
-      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GNU_SOURCE" CACHE STRING "" FORCE)
-    endif ()
+if (UNIX AND NOT CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+  if (NOT CMAKE_BUILD_TYPE)
+    # Can set to "RelWithDebInfo" or "Debug" also, but problems occur if this is blank by default
+    set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Default build type" FORCE)
+  endif ()
+  if (NOT DEFINED CMAKE_CXX_FLAGS OR CMAKE_CXX_FLAGS MATCHES "")
+    set(CMAKE_CXX_FLAGS " ")
+  endif ()
+  STRING(FIND ${CMAKE_CXX_FLAGS} "GLM_ENABLE_EXPERIMENTAL" GLM_FLAG_POS)
+  if (${GLM_FLAG_POS} EQUAL -1)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DGLM_ENABLE_EXPERIMENTAL" CACHE STRING "" FORCE)
+  endif ()
+  set(OpenGL_GL_PREFERENCE "GLVND" CACHE STRING "OpenGL Preference setting necessary for linux" FORCE)
+  # Fix for GCC tolerating space in target name
+  if (NOT DEFINED CMAKE_C_FLAGS OR CMAKE_C_FLAGS MATCHES "")
+    set(CMAKE_C_FLAGS " ")
+  endif ()
+  STRING(FIND ${CMAKE_C_FLAGS} "_GNU_SOURCE" GNUSOURCE_FLAG_POS)
+  if (${GNUSOURCE_FLAG_POS} EQUAL -1)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_GNU_SOURCE" CACHE STRING "" FORCE)
  endif ()
 endif ()

@@ -176,12 +163,12 @@ add_custom_target(
 add_dependencies(run_codegen codegen)
 add_custom_command(
  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/__codegen.h"
-  COMMAND codegen ARGS "${OPENSPACE_BASE_DIR}/modules" "${OPENSPACE_BASE_DIR}/src"
+  COMMAND codegen ARGS "${PROJECT_SOURCE_DIR}/modules" "${PROJECT_SOURCE_DIR}/src"
  VERBATIM
 )
-set_folder_location(codegen-lib "support")
-set_folder_location(codegen "support")
-set_folder_location(run_codegen "support")
+set_target_properties(codegen-lib PROPERTIES FOLDER "support")
+set_target_properties(codegen PROPERTIES FOLDER "support")
+set_target_properties(run_codegen PROPERTIES FOLDER "support")


 # Qt
@@ -218,12 +205,12 @@ end_header("End: Configuring Modules")


 add_subdirectory(support/coding/codegen/tests)
-set_folder_location(run_test_codegen "Unit Tests/support")
-set_folder_location(codegentest "Unit Tests")
+set_target_properties(run_test_codegen PROPERTIES FOLDER "Unit Tests/support")
+set_target_properties(codegentest PROPERTIES FOLDER "Unit Tests")


 begin_header("Configuring Applications")
-add_subdirectory("${OPENSPACE_APPS_DIR}")
+add_subdirectory(apps)
 end_header("End: Configuring Applications")


@@ -235,7 +222,7 @@ endif ()
 option(OPENSPACE_HAVE_TESTS "Activate the OpenSpace unit tests" ON)
 if (OPENSPACE_HAVE_TESTS)
  begin_header("Generating OpenSpace unit test")
-  add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/tests")
+  add_subdirectory(tests)
  end_header()
 endif (OPENSPACE_HAVE_TESTS)

@@ -250,7 +237,7 @@ if (OPENSPACE_MODULE_WEBBROWSER AND CEF_ROOT)
  set(PROJECT_ARCH "x86_64")

  if (WIN32)
-    set(RESOURCE_FILE ${OPENSPACE_APPS_DIR}/OpenSpace/openspace.rc)
+    set(RESOURCE_FILE openspace.rc)
  endif ()

  # Add the CEF binary distribution's cmake/ directory to the module path and
@@ -266,6 +253,6 @@ endif ()
 ##########################################################################################

 # Manage the CPack packaging
-include(${OPENSPACE_CMAKE_EXT_DIR}/packaging.cmake)
+include(${PROJECT_SOURCE_DIR}/support/cmake/packaging.cmake)

 end_header("End: Configuring OpenSpace project")
--- a/apps/OpenSpace-MinVR/CMakeLists.txt
+++ b/apps/OpenSpace-MinVR/CMakeLists.txt
@@ -22,9 +22,9 @@
 # OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                          #
 ##########################################################################################

-include(${GHOUL_BASE_DIR}/support/cmake/copy_shared_libraries.cmake)
-include(${OPENSPACE_CMAKE_EXT_DIR}/application_definition.cmake)
-include(${OPENSPACE_CMAKE_EXT_DIR}/global_variables.cmake)
+include(${PROJECT_SOURCE_DIR}/ext/ghoul/support/cmake/copy_shared_libraries.cmake)
+include(${PROJECT_SOURCE_DIR}/support/cmake/application_definition.cmake)
+include(${PROJECT_SOURCE_DIR}/support/cmake/global_variables.cmake)

 set(MACOSX_BUNDLE_ICON_FILE openspace.icns)

@@ -57,7 +57,7 @@ target_link_libraries(OpenSpace-MinVR PUBLIC openspace-core MinVR)
 # target as of July 2017, which is needed.
 if (OPENSPACE_MODULE_WEBBROWSER AND CEF_ROOT)
  if (WIN32)
-    set(RESOURCE_FILE ${OPENSPACE_APPS_DIR}/OpenSpace-MinVR/openspace.rc)
+    set(RESOURCE_FILE openspace.rc)
  endif ()

  # Add the CEF binary distribution's cmake/ directory to the module path and
--- a/apps/OpenSpace/CMakeLists.txt
+++ b/apps/OpenSpace/CMakeLists.txt
@@ -22,9 +22,8 @@
 # OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                          #
 ##########################################################################################

-include(${GHOUL_BASE_DIR}/support/cmake/copy_shared_libraries.cmake)
-include(${GHOUL_BASE_DIR}/support/cmake/message_macros.cmake)
-include(${OPENSPACE_CMAKE_EXT_DIR}/application_definition.cmake)
+include(${PROJECT_SOURCE_DIR}/ext/ghoul/support/cmake/message_macros.cmake)
+include(${PROJECT_SOURCE_DIR}/support/cmake/application_definition.cmake)

 # We are getting all_enabled_modules from the handle_applications.cmake file which gets
 # it from the main CMakeLists file
@@ -43,14 +42,14 @@ if (OPENSPACE_OPENVR_SUPPORT)
    if (WIN32)
      find_path(SGCT_OPENVR_INCLUDE_DIRECTORY
        NAMES SGCTOpenVR.h
-        PATHS ${OPENSPACE_BASE_DIR}/ext/sgct/additional_includes/openvr NO_DEFAULT_PATH
+        PATHS ${PROJECT_SOURCE_DIR}/ext/sgct/additional_includes/openvr NO_DEFAULT_PATH
        REQUIRED
      )
    else ()
      find_path(SGCT_OPENVR_INCLUDE_DIRECTORY
        NAMES SGCTOpenVR.h
        PATH_SUFFIXES SGCTOpenVR
-        PATHS ${OPENSPACE_BASE_DIR}/ext/sgct/additional_includes/openvr
+        PATHS ${PROJECT_SOURCE_DIR}/ext/sgct/additional_includes/openvr
        REQUIRED
      )
    endif ()
@@ -115,19 +114,14 @@ set(SGCT_TEXT OFF CACHE BOOL "" FORCE)
 set(SGCT_DEP_INCLUDE_FREETYPE OFF CACHE BOOL "" FORCE)
 set(SGCT_DEP_INCLUDE_FMT OFF CACHE BOOL "" FORCE)
 set(SGCT_DEP_INCLUDE_SCN OFF CACHE BOOL "" FORCE)
+set(SGCT_DEP_INCLUDE_CATCH2 OFF CACHE BOOL "" FORCE)

 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/ext/sgct)
 target_link_libraries(OpenSpace PRIVATE sgct)

-set_folder_location(sgct "External")
-set_folder_location(glfw "External")
-set_folder_location(miniziplibstatic "External")
-set_folder_location(png16_static "External")
-set_folder_location(quat "External")
-set_folder_location(tinyxml2static "External")
-set_folder_location(vrpn "External")
-set_folder_location(zlibstatic "External")
-set_folder_location(SGCTTest "Unit Tests")
+set_target_properties(sgct PROPERTIES FOLDER "External")
+set_target_properties(glfw PROPERTIES FOLDER "External")
+set_target_properties(SGCTTest PROPERTIES FOLDER "External")

 if (UNIX AND (NOT APPLE))
  target_link_libraries(OpenSpace PRIVATE Xcursor Xinerama X11)
@@ -161,7 +155,7 @@ if (OPENSPACE_MODULE_WEBBROWSER AND CEF_ROOT)
  set(PROJECT_ARCH "x86_64")

  if (WIN32)
-    set(RESOURCE_FILE ${OPENSPACE_APPS_DIR}/OpenSpace/openspace.rc)
+    set(RESOURCE_FILE openspace.rc)
  endif ()

  # Add the CEF binary distribution's cmake/ directory to the module path and
--- a/apps/OpenSpace/ext/launcher/CMakeLists.txt
+++ b/apps/OpenSpace/ext/launcher/CMakeLists.txt
@@ -22,7 +22,7 @@
 # OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                          #
 ##########################################################################################

-include(${OPENSPACE_CMAKE_EXT_DIR}/set_openspace_compile_settings.cmake)
+include(${PROJECT_SOURCE_DIR}/support/cmake/set_openspace_compile_settings.cmake)

 set(HEADER_FILES
  include/filesystemaccess.h
@@ -113,8 +113,9 @@ target_include_directories(
  openspace-ui-launcher
  PUBLIC
  include
-  ${OPENSPACE_APPS_DIR}/OpenSpace/ext/sgct/include
-  ${OPENSPACE_APPS_DIR}/OpenSpace/ext/sgct/sgct/ext/glm
+  # @TODO:  This should be handled in a better way
+  ../sgct/include
+  ../sgct/sgct/ext/glm
 )
 target_link_libraries(
  openspace-ui-launcher
--- a/apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp
@@ -457,8 +457,8 @@ bool HorizonsDialog::isValidInput() {
    // Range 1 to 2147483647 (max of 32 bit int).
    // Horizons read the step size into a 32 bit int, but verifies the input on their
    // website as a uint32_t. If step size over 32 bit int is sent, this error message is
-    // recived: Cannot read numeric value -- re-enter
-    if (step < 1 || step > std::numeric_limits<int32_t>::max()) {
+    // received: Cannot read numeric value -- re-enter
+    if (step < 1) {
        _errorMsg->setText(QString::fromStdString(fmt::format(
            "Step size is outside valid range 1 to '{}'",
            std::numeric_limits<int32_t>::max()
--- a/apps/OpenSpace/ext/launcher/src/profile/timedialog.cpp
+++ b/apps/OpenSpace/ext/launcher/src/profile/timedialog.cpp
@@ -52,7 +52,8 @@ TimeDialog::TimeDialog(QWidget* parent, std::optional<openspace::Profile::Time>*
            if (_timeData.value.empty()) {
                _timeData.value = "0d";
            }
-            _relativeEdit->setSelection(0, _relativeEdit->text().length());
+            int len = static_cast<int>(_relativeEdit->text().length());
+            _relativeEdit->setSelection(0, len);
        }
        else {
            _absoluteEdit->setSelectedSection(QDateTimeEdit::YearSection);
--- a/apps/OpenSpace/ext/sgct
+++ b/apps/OpenSpace/ext/sgct
--- a/apps/Sync/CMakeLists.txt
+++ b/apps/Sync/CMakeLists.txt
@@ -22,7 +22,7 @@
 # OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                          #
 ##########################################################################################

-include(${OPENSPACE_CMAKE_EXT_DIR}/application_definition.cmake)
+include(${PROJECT_SOURCE_DIR}/support/cmake/application_definition.cmake)

 set_source_files_properties(
  ${CMAKE_CURRENT_SOURCE_DIR}/openspace.icns
@@ -47,7 +47,7 @@ if (OPENSPACE_MODULE_WEBBROWSER AND CEF_ROOT)
  set(CMAKE_BUILD_TYPE Debug CACHE STRING "CMAKE_BUILD_TYPE")

  if (WIN32)
-    set(RESOURCE_FILE ${OPENSPACE_APPS_DIR}/OpenSpace/openspace.rc)
+    set(RESOURCE_FILE openspace.rc)
  endif ()

  # Add the CEF binary distribution's cmake/ directory to the module path and
--- a/apps/TaskRunner/CMakeLists.txt
+++ b/apps/TaskRunner/CMakeLists.txt
@@ -22,7 +22,7 @@
 # OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                          #
 ##########################################################################################

-include(${OPENSPACE_CMAKE_EXT_DIR}/application_definition.cmake)
+include(${PROJECT_SOURCE_DIR}/support/cmake/application_definition.cmake)

 set_source_files_properties(
  ${CMAKE_CURRENT_SOURCE_DIR}/openspace.icns
@@ -47,7 +47,7 @@ if (OPENSPACE_MODULE_WEBBROWSER AND CEF_ROOT)
  set(CMAKE_BUILD_TYPE Debug CACHE STRING "CMAKE_BUILD_TYPE")

  if (WIN32)
-    set(RESOURCE_FILE ${OPENSPACE_APPS_DIR}/OpenSpace/openspace.rc)
+    set(RESOURCE_FILE openspace.rc)
  endif ()

  # Add the CEF binary distribution's cmake/ directory to the module path and
--- a/ext/CMakeLists.txt
+++ b/ext/CMakeLists.txt
@@ -22,8 +22,6 @@
 # OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                          #
 ##########################################################################################

-include(${OPENSPACE_CMAKE_EXT_DIR}/set_openspace_compile_settings.cmake)
-
 # System libraries
 if (APPLE)
  begin_dependency("Core Libraries")
@@ -48,16 +46,14 @@ endif ()

 # Ghoul
 add_subdirectory(ghoul)
-set_folder_location(Lua "External")
-set_folder_location(lz4 "External")
-set_folder_location(GhoulTest "Unit Tests")
+set_target_properties(GhoulTest PROPERTIES FOLDER "Unit Tests")

 # Spice
 begin_dependency("Spice")
 set(SPICE_BUILD_SHARED_LIBRARY OFF CACHE BOOL "" FORCE)
-add_subdirectory(spice)
+add_subdirectory(spice SYSTEM)
 target_compile_features(spice PUBLIC cxx_std_20)
-set_folder_location(spice "External")
+set_target_properties(spice PROPERTIES FOLDER "External")
 end_dependency()

 # Curl
--- a/ext/ghoul
+++ b/ext/ghoul
--- a/modules/CMakeLists.txt
+++ b/modules/CMakeLists.txt
@@ -22,8 +22,8 @@
 # OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                          #
 ##########################################################################################

-include(${OPENSPACE_CMAKE_EXT_DIR}/global_variables.cmake)
-include(${GHOUL_BASE_DIR}/support/cmake/message_macros.cmake)
+include(${PROJECT_SOURCE_DIR}/support/cmake/global_variables.cmake)
+include(${PROJECT_SOURCE_DIR}/ext/ghoul/support/cmake/message_macros.cmake)


 # This function takes a list of module paths and returns the list of include paths that
@@ -164,7 +164,7 @@ endfunction ()


 set(OPENSPACE_EXTERNAL_MODULES_PATHS "" CACHE STRING "List of external modules")
-set(internal_module_path "${OPENSPACE_BASE_DIR}/modules")
+set(internal_module_path "${PROJECT_SOURCE_DIR}/modules")
 set(all_enabled_modules "")


@@ -378,12 +378,12 @@ if (NOT "${MODULE_PATHS}" STREQUAL "")
 endif ()

 configure_file(
-  ${OPENSPACE_CMAKE_EXT_DIR}/module_registration.template
+  ${PROJECT_SOURCE_DIR}/support/cmake/module_registration.template
  ${CMAKE_BINARY_DIR}/_generated/include/openspace/moduleregistration.h
 )

 configure_file(
-  ${OPENSPACE_CMAKE_EXT_DIR}/module_path.template
+  ${PROJECT_SOURCE_DIR}/support/cmake/module_path.template
  ${CMAKE_BINARY_DIR}/_generated/include/openspace/modulepath.h
 )

--- a/modules/atmosphere/CMakeLists.txt
+++ b/modules/atmosphere/CMakeLists.txt
@@ -22,7 +22,7 @@
 # OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                          #
 ##########################################################################################

-include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
+include(${PROJECT_SOURCE_DIR}/support/cmake/module_definition.cmake)

 set(HEADER_FILES
  rendering/atmospheredeferredcaster.h
--- a/modules/base/CMakeLists.txt
+++ b/modules/base/CMakeLists.txt
@@ -22,7 +22,7 @@
 # OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                          #
 ##########################################################################################

-include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
+include(${PROJECT_SOURCE_DIR}/support/cmake/module_definition.cmake)

 set(HEADER_FILES
  dashboard/dashboarditemangle.h
--- a/modules/base/rendering/renderablemodel.cpp
+++ b/modules/base/rendering/renderablemodel.cpp
@@ -732,7 +732,7 @@ void RenderableModel::update(const UpdateData& data) {
                // starts again
                // s/\/\/\/\ ...
                relativeTime =
-                    duration - abs(fmod(now - startTime, 2 * duration) - duration);
+                    duration - std::abs(fmod(now - startTime, 2 * duration) - duration);
                break;
            case AnimationMode::BounceInfinitely: {
                // Bounce both before and after the start time where the model is
@@ -742,7 +742,7 @@ void RenderableModel::update(const UpdateData& data) {
                if (modulo < 0.0) {
                    modulo += 2 * duration;
                }
-                relativeTime = duration - abs(modulo - duration);
+                relativeTime = duration - std::abs(modulo - duration);
                break;
            }
            case AnimationMode::Once:
--- a/modules/cefwebgui/CMakeLists.txt
+++ b/modules/cefwebgui/CMakeLists.txt
@@ -22,7 +22,7 @@
 # OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                          #
 ##########################################################################################

-include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
+include(${PROJECT_SOURCE_DIR}/support/cmake/module_definition.cmake)
 include(../webbrowser/cmake/webbrowser_helpers.cmake)

 set(CEFWEBGUI_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "CEFWEBGUI_MODULE_PATH")
--- a/modules/debugging/CMakeLists.txt
+++ b/modules/debugging/CMakeLists.txt
@@ -22,7 +22,7 @@
 # OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                          #
 ##########################################################################################

-include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
+include(${PROJECT_SOURCE_DIR}/support/cmake/module_definition.cmake)

 set(HEADER_FILES
  debuggingmodule.h
--- a/modules/digitaluniverse/CMakeLists.txt
+++ b/modules/digitaluniverse/CMakeLists.txt
@@ -22,7 +22,7 @@
 # OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                          #
 ##########################################################################################

-include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
+include(${PROJECT_SOURCE_DIR}/support/cmake/module_definition.cmake)

 set(HEADER_FILES
  rendering/renderablepoints.h
@@ -34,7 +34,7 @@ source_group("Header Files" FILES ${HEADER_FILES})

 set(SOURCE_FILES
  rendering/renderablepoints.cpp
-  rendering/renderabledumeshes.cpp 
+  rendering/renderabledumeshes.cpp
  rendering/renderablebillboardscloud.cpp
  rendering/renderableplanescloud.cpp
 )
--- a/modules/digitaluniverse/rendering/renderableplanescloud.h
+++ b/modules/digitaluniverse/rendering/renderableplanescloud.h
@@ -87,7 +87,6 @@ private:

    bool _hasSpeckFile = false;
    bool _dataIsDirty = true;
-    bool _textColorIsDirty = true;
    bool _hasLabels = false;

    properties::FloatProperty _scaleFactor;
--- a/modules/exoplanets/CMakeLists.txt
+++ b/modules/exoplanets/CMakeLists.txt
@@ -22,7 +22,7 @@
 # OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                          #
 ##########################################################################################

-include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
+include(${PROJECT_SOURCE_DIR}/support/cmake/module_definition.cmake)

 set(HEADER_FILES
    exoplanetshelper.h
--- a/modules/fieldlines/CMakeLists.txt
+++ b/modules/fieldlines/CMakeLists.txt
@@ -22,7 +22,7 @@
 # OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                          #
 ##########################################################################################

-include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
+include(${PROJECT_SOURCE_DIR}/support/cmake/module_definition.cmake)

 set(HEADER_FILES
  rendering/renderablefieldlines.h
--- a/modules/fieldlinessequence/CMakeLists.txt
+++ b/modules/fieldlinessequence/CMakeLists.txt
@@ -22,7 +22,7 @@
 # OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                          #
 ##########################################################################################

-include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
+include(${PROJECT_SOURCE_DIR}/support/cmake/module_definition.cmake)

 set(HEADER_FILES
  rendering/renderablefieldlinessequence.h
--- a/modules/fitsfilereader/CMakeLists.txt
+++ b/modules/fitsfilereader/CMakeLists.txt
@@ -22,8 +22,7 @@
 # OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                          #
 ##########################################################################################

-include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
-include(${GHOUL_BASE_DIR}/support/cmake/handle_external_library.cmake)
+include(${PROJECT_SOURCE_DIR}/support/cmake/module_definition.cmake)

 set(HEADER_FILES
  fitsfilereadermodule.h
@@ -31,7 +30,7 @@ set(HEADER_FILES
 )
 source_group("Header Files" FILES ${HEADER_FILES})

-set(SOURCE_FILES 
+set(SOURCE_FILES
  fitsfilereadermodule.cpp
  src/fitsfilereader.cpp
 )
@@ -44,25 +43,28 @@ create_new_module(
  ${SOURCE_FILES}
 )

-# Set root directories for external libraries.
-set(CFITSIO_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ext/cfitsio/")
-set(CCFITS_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ext/CCfits/")
-set(INCLUDES_FOR_TARGET ${CCFITS_ROOT_DIR} "${CCFITS_ROOT_DIR}/../" ${CFITSIO_ROOT_DIR})
-set(MODULE_NAME openspace-module-fitsfilereader)
-
 # CCfits is dependent on cfitsio, let it handle the internal linking
-add_subdirectory(${CFITSIO_ROOT_DIR})
-set_folder_location(cfitsio "External")
+add_subdirectory(ext/cfitsio SYSTEM)
+set_target_properties(cfitsio PROPERTIES FOLDER "External")
 set(cfitsio_BUILD_SHARED_LIBS OFF)

-add_subdirectory(${CCFITS_ROOT_DIR})
-set_folder_location(CCfits "External")
+add_subdirectory(ext/CCfits SYSTEM)
+set_target_properties(CCfits PROPERTIES FOLDER "External")
 set(CCfits_BUILD_SHARED_LIBS OFF)

-disable_external_warnings(cfitsio)
-disable_external_warnings(CCfits)
+if (MSVC)
+  target_compile_options(cfitsio PRIVATE "/W0")
+  target_compile_definitions(cfitsio PRIVATE "_SCL_SECURE_NO_WARNINGS")

-target_include_directories(openspace-module-fitsfilereader SYSTEM PRIVATE ${INCLUDES_FOR_TARGET})
+  target_compile_options(CCfits PRIVATE "/W0")
+  target_compile_definitions(CCfits PRIVATE "_SCL_SECURE_NO_WARNINGS")
+else ()
+  target_compile_options(cfitsio PRIVATE "-w")
+  target_compile_options(CCfits PRIVATE "-w")
+endif ()
+
+
+target_include_directories(openspace-module-fitsfilereader SYSTEM PRIVATE ext ext/CCfits ext/cfitsio)
 target_link_libraries(openspace-module-fitsfilereader PRIVATE cfitsio CCfits)

 target_precompile_headers(CCfits PRIVATE
--- a/modules/gaia/CMakeLists.txt
+++ b/modules/gaia/CMakeLists.txt
@@ -22,17 +22,17 @@
 # OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                          #
 ##########################################################################################

-include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
+include(${PROJECT_SOURCE_DIR}/support/cmake/module_definition.cmake)

 set(HEADER_FILES
  gaiamodule.h
  rendering/renderablegaiastars.h
  rendering/octreemanager.h
  rendering/octreeculler.h
-  tasks/readfilejob.h 
-  tasks/readfitstask.h 
+  tasks/readfilejob.h
+  tasks/readfitstask.h
  tasks/readspecktask.h
-  tasks/constructoctreetask.h 
+  tasks/constructoctreetask.h
  rendering/gaiaoptions.h
 )
 source_group("Header Files" FILES ${HEADER_FILES})
--- a/modules/gaia/rendering/renderablegaiastars.cpp
+++ b/modules/gaia/rendering/renderablegaiastars.cpp
@@ -928,7 +928,7 @@ void RenderableGaiaStars::render(const RenderData& data, RendererTasks&) {
    glm::vec2 screenSize = glm::vec2(global::renderEngine->renderingResolution());

    // Wait until camera has stabilized before we traverse the Octree/stream from files.
-    const double rotationDiff = abs(length(_previousCameraRotation) -
+    const double rotationDiff = std::abs(length(_previousCameraRotation) -
                                length(data.camera.rotationQuaternion()));
    if (_firstDrawCalls && rotationDiff > 1e-10) {
        _previousCameraRotation = data.camera.rotationQuaternion();
--- a/modules/galaxy/CMakeLists.txt
+++ b/modules/galaxy/CMakeLists.txt
@@ -22,10 +22,10 @@
 # OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                          #
 ##########################################################################################

-include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
+include(${PROJECT_SOURCE_DIR}/support/cmake/module_definition.cmake)

 set(HEADER_FILES
-  galaxymodule.h  
+  galaxymodule.h
  rendering/galaxyraycaster.h
  rendering/renderablegalaxy.h
  tasks/milkywayconversiontask.h
@@ -34,7 +34,7 @@ set(HEADER_FILES
 source_group("Header Files" FILES ${HEADER_FILES})

 set(SOURCE_FILES
-  galaxymodule.cpp  
+  galaxymodule.cpp
  rendering/galaxyraycaster.cpp
  rendering/renderablegalaxy.cpp
  tasks/milkywayconversiontask.cpp
--- a/modules/globebrowsing/CMakeLists.txt
+++ b/modules/globebrowsing/CMakeLists.txt
@@ -22,7 +22,7 @@
 # OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                          #
 ##########################################################################################

-include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
+include(${PROJECT_SOURCE_DIR}/support/cmake/module_definition.cmake)

 set(HEADER_FILES
  globebrowsingmodule.h
--- a/modules/globebrowsing/globebrowsingmodule.cpp
+++ b/modules/globebrowsing/globebrowsingmodule.cpp
@@ -146,7 +146,7 @@ namespace {
            std::fill(IdentifierBuffer.begin(), IdentifierBuffer.end(), '\0');
            int ret = sscanf(
                subDatasets[i],
-                "SUBDATASET_%i_%256[^=]",
+                "SUBDATASET_%i_%255[^=]",
                &iDataset,
                IdentifierBuffer.data()
            );
--- a/modules/globebrowsing/src/layermanager.cpp
+++ b/modules/globebrowsing/src/layermanager.cpp
@@ -145,7 +145,7 @@ std::array<LayerGroup*, LayerManager::NumLayerGroups> LayerManager::layerGroups(
    ZoneScoped

    std::array<LayerGroup*, NumLayerGroups> res = {};
-    for (int i = 0; i < NumLayerGroups; ++i) {
+    for (size_t i = 0; i < NumLayerGroups; ++i) {
        res[i] = _layerGroups[i].get();
    }
    return res;
--- a/modules/globebrowsing/src/renderableglobe.cpp
+++ b/modules/globebrowsing/src/renderableglobe.cpp
@@ -1713,7 +1713,7 @@ void RenderableGlobe::recompileShaders() {
    }

    ghoul::Dictionary layerGroupNames;
-    for (int i = 0; i < layers::Groups.size(); ++i) {
+    for (size_t i = 0; i < layers::Groups.size(); ++i) {
        layerGroupNames.setValue(
            std::to_string(i),
            std::string(layers::Groups[i].identifier)
--- a/modules/imgui/CMakeLists.txt
+++ b/modules/imgui/CMakeLists.txt
@@ -22,7 +22,7 @@
 # OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                          #
 ##########################################################################################

-include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
+include(${PROJECT_SOURCE_DIR}/support/cmake/module_definition.cmake)

 set(HEADER_FILES
  include/guiactioncomponent.h
@@ -74,4 +74,6 @@ create_new_module(
  ${HEADER_FILES} ${SOURCE_FILES} ${SHADER_FILES}
 )

-include_external_library(${imgui_module} PUBLIC Imgui ${CMAKE_CURRENT_SOURCE_DIR}/ext/imgui)
+add_subdirectory(ext/imgui SYSTEM)
+target_link_libraries(${imgui_module} PUBLIC Imgui)
+set_target_properties(Imgui PROPERTIES FOLDER "External")
--- a/modules/imgui/src/guipropertycomponent.cpp
+++ b/modules/imgui/src/guipropertycomponent.cpp
@@ -53,14 +53,6 @@ namespace {
        "elements not listed"
    };

-    constexpr openspace::properties::Property::PropertyInfo IgnoreHiddenInfo = {
-        "IgnoreHidden",
-        "Ignore Hidden Hint",
-        "If this value is 'true', all 'Hidden' hints passed into the SceneGraphNodes are "
-        "ignored and thus all SceneGraphNodes are displayed. If this value is 'false', "
-        "the hidden hints are followed"
-    };
-
    int nVisibleProperties(const std::vector<openspace::properties::Property*>& props)
    {
        using Visibility = openspace::properties::Property::Visibility;
--- a/modules/iswa/CMakeLists.txt
+++ b/modules/iswa/CMakeLists.txt
@@ -22,7 +22,7 @@
 # OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                          #
 ##########################################################################################

-include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
+include(${PROJECT_SOURCE_DIR}/support/cmake/module_definition.cmake)

 set(HEADER_FILES
  rendering/datacygnet.h
--- a/modules/kameleon/CMakeLists.txt
+++ b/modules/kameleon/CMakeLists.txt
@@ -22,12 +22,7 @@
 # OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                          #
 ##########################################################################################

-include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
-include(${GHOUL_BASE_DIR}/support/cmake/handle_external_library.cmake)
-
-# Use <PackageName>_ROOT variables
-# https://cmake.org/cmake/help/git-stage/policy/CMP0074.html
-cmake_policy(SET CMP0074 NEW)
+include(${PROJECT_SOURCE_DIR}/support/cmake/module_definition.cmake)

 set(HEADER_FILES
  include/kameleonwrapper.h
@@ -58,17 +53,22 @@ mark_as_advanced(BUILD_SHARED_LIBS) # Change to set instead of option
 option(KAMELEON_USE_HDF5 "Kameleon use HDF5" OFF)
 set(KAMELEON_ROOT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ext/kameleon)
 set(KAMELEON_INCLUDES ${KAMELEON_ROOT_DIR}/src)
-add_subdirectory(${KAMELEON_ROOT_DIR})
+add_subdirectory(${KAMELEON_ROOT_DIR} SYSTEM)
 target_include_directories(${kameleon_module} SYSTEM PUBLIC ${KAMELEON_INCLUDES})
 target_link_libraries(${kameleon_module} PRIVATE ccmc)
 mark_as_advanced(CDF_BUILD_ZLIB CDF_INCLUDES CDF_LIBRARY CDF_USE_STATIC_LIBS
  CDF_USE_ZLIB HDF5_DIR HDF5_USE_STATIC_LIBRARIES KAMELEON_LIBRARY_ONLY KAMELEON_USE_HDF5
 )
-disable_external_warnings(ccmc)
-set_folder_location(ccmc "External")
+set_target_properties(ccmc PROPERTIES FOLDER "External")
 if (TARGET cdf)
-  disable_external_warnings(cdf)
-  set_folder_location(cdf "External")
+  if (MSVC)
+    target_compile_options(cdf PRIVATE "/W0")
+    target_compile_definitions(cdf PRIVATE "_SCL_SECURE_NO_WARNINGS")
+  else ()
+    target_compile_options(cdf PRIVATE "-w")
+  endif ()
+
+  set_target_properties(cdf PROPERTIES FOLDER "External")
 endif ()

 target_precompile_headers(cdf PRIVATE
@@ -84,10 +84,3 @@ target_precompile_headers(ccmc PRIVATE
  "$<$<COMPILE_LANGUAGE:CXX>:vector>"
  "$<$<COMPILE_LANGUAGE:CXX>:boost/unordered_map.hpp>"
 )
-
-if (WIN32)
-  target_compile_options(ccmc PRIVATE /MP)
-  if (TARGET cdf)
-    target_compile_options(cdf PRIVATE /MP)
-  endif ()
-endif ()
--- a/modules/kameleonvolume/CMakeLists.txt
+++ b/modules/kameleonvolume/CMakeLists.txt
@@ -22,7 +22,7 @@
 # OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                          #
 ##########################################################################################

-include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
+include(${PROJECT_SOURCE_DIR}/support/cmake/module_definition.cmake)

 set(HEADER_FILES
  kameleonvolumereader.h
--- a/modules/multiresvolume/CMakeLists.txt
+++ b/modules/multiresvolume/CMakeLists.txt
@@ -22,7 +22,7 @@
 # OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                          #
 ##########################################################################################

-include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
+include(${PROJECT_SOURCE_DIR}/support/cmake/module_definition.cmake)

 set(HEADER_FILES
  rendering/atlasmanager.h
--- a/modules/server/CMakeLists.txt
+++ b/modules/server/CMakeLists.txt
@@ -22,7 +22,7 @@
 # OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                          #
 ##########################################################################################

-include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
+include(${PROJECT_SOURCE_DIR}/support/cmake/module_definition.cmake)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})

 set(HEADER_FILES
--- a/modules/server/servermodule.cpp
+++ b/modules/server/servermodule.cpp
@@ -56,7 +56,7 @@ ServerModule::ServerModule()
        // Trigger callbacks
        using K = CallbackHandle;
        using V = CallbackFunction;
-        for (const std::pair<const K, V>& it : _preSyncCallbacks) {
+        for (const std::pair<K, V>& it : _preSyncCallbacks) {
            it.second(); // call function
        }
    });
--- a/modules/server/src/topics/cameratopic.cpp
+++ b/modules/server/src/topics/cameratopic.cpp
@@ -37,7 +37,6 @@

 namespace {
    constexpr std::string_view SubscribeEvent = "start_subscription";
-    constexpr std::string_view UnsubscribeEvent = "stop_subscription";
 } // namespace

 using nlohmann::json;
--- a/modules/skybrowser/CMakeLists.txt
+++ b/modules/skybrowser/CMakeLists.txt
@@ -22,7 +22,7 @@
 # OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                          #
 ##########################################################################################

-include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
+include(${PROJECT_SOURCE_DIR}/support/cmake/module_definition.cmake)

 set(HEADER_FILES
  skybrowsermodule.h
@@ -33,7 +33,6 @@ set(HEADER_FILES
  include/wwtcommunicator.h
  include/browser.h
  include/screenspaceskybrowser.h
-  ext/tinyxml2/tinyxml2.h
 )
 source_group("Header Files" FILES ${HEADER_FILES})

@@ -47,7 +46,6 @@ set(SOURCE_FILES
  src/wwtcommunicator.cpp
  src/browser.cpp
  src/screenspaceskybrowser.cpp
-  ext/tinyxml2/tinyxml2.cpp
 )
 source_group("Source Files" FILES ${SOURCE_FILES})

@@ -67,3 +65,8 @@ target_precompile_headers(${skybrowser_module} PRIVATE
  [["include/cef_accessibility_handler.h"]]
  [["include/cef_render_handler.h"]]
 )
+
+# This introduces a dependency into SGCT, but the way it is handled is not great right now
+# This will break when we remove tinyxml2 from SGCT and then we can move the submodule
+# over into this ext folder and fix it well
+target_link_libraries(${skybrowser_module} PRIVATE tinyxml2)
--- a/modules/skybrowser/ext/tinyxml2/tinyxml2.cpp
+++ b/modules/skybrowser/ext/tinyxml2/tinyxml2.cpp
--- a/modules/skybrowser/ext/tinyxml2/tinyxml2.h
+++ b/modules/skybrowser/ext/tinyxml2/tinyxml2.h
--- a/modules/skybrowser/include/screenspaceskybrowser.h
+++ b/modules/skybrowser/include/screenspaceskybrowser.h
@@ -75,7 +75,6 @@ private:
    void bindTexture() override;

    // Flags
-    bool _isSyncedWithWwt = false;
    bool _isInitialized = false;
    bool _radiusIsDirty = false;
    int _borderRadiusTimer = -1;
--- a/modules/skybrowser/include/wwtcommunicator.h
+++ b/modules/skybrowser/include/wwtcommunicator.h
@@ -43,7 +43,7 @@ public:
    void selectImage(const std::string& url, int i);
    void addImageLayerToWwt(const std::string& url, int i);
    void removeSelectedImage(int i);
-    void setImageOrder(int i, int order);
+    void setImageOrder(int image, int order);
    void loadImageCollection(const std::string& collection);
    void setImageOpacity(int i, float opacity);
    void hideChromeInterface() const;
--- a/modules/skybrowser/skybrowsermodule.cpp
+++ b/modules/skybrowser/skybrowsermodule.cpp
@@ -182,7 +182,7 @@ SkyBrowserModule::SkyBrowserModule()
    // Set callback functions
    global::callback::mouseButton->emplace(
        global::callback::mouseButton->begin(),
-        [&](MouseButton button, MouseAction action, KeyModifier, IsGuiWindow) -> bool {
+        [&](MouseButton, MouseAction action, KeyModifier, IsGuiWindow) -> bool {
            if (action == MouseAction::Press) {
                _cameraRotation.stop();
            }
--- a/modules/skybrowser/src/screenspaceskybrowser.cpp
+++ b/modules/skybrowser/src/screenspaceskybrowser.cpp
@@ -187,7 +187,7 @@ void ScreenSpaceSkyBrowser::setIsInitialized(bool isInitialized) {

 void ScreenSpaceSkyBrowser::updateTextureResolution() {
    // Check if texture quality has changed. If it has, adjust accordingly
-    if (abs(_textureQuality.value() - _lastTextureQuality) > glm::epsilon<float>()) {
+    if (std::abs(_textureQuality.value() - _lastTextureQuality) > glm::epsilon<float>()) {
        float diffTextureQuality = _textureQuality / _lastTextureQuality;
        glm::vec2 newRes = glm::vec2(_browserDimensions.value()) * diffTextureQuality;
        _browserDimensions = glm::ivec2(newRes);
--- a/modules/skybrowser/src/targetbrowserpair.cpp
+++ b/modules/skybrowser/src/targetbrowserpair.cpp
@@ -319,7 +319,7 @@ void TargetBrowserPair::startAnimation(glm::dvec3 galacticCoords, double fovEnd)
    SkyBrowserModule* module = global::moduleEngine->module<SkyBrowserModule>();
    double fovSpeed = module->browserAnimationSpeed();
    // The speed is given degrees /sec
-    double fovTime = abs(_browser->verticalFov() - fovEnd) / fovSpeed;
+    double fovTime = std::abs(_browser->verticalFov() - fovEnd) / fovSpeed;
    // Fov animation
    _fovAnimation = skybrowser::Animation(_browser->verticalFov(), fovEnd, fovTime);

--- a/modules/skybrowser/src/utility.cpp
+++ b/modules/skybrowser/src/utility.cpp
@@ -170,7 +170,9 @@ bool isCoordinateInView(const glm::dvec3& equatorial) {
    double r = windowRatio();

    bool isCoordInView =
-        abs(coordsScreen.x) < r && abs(coordsScreen.y) < 1.f && coordsScreen.z < 0.f;
+        std::abs(coordsScreen.x) < r &&
+        std::abs(coordsScreen.y) < 1.f &&
+        coordsScreen.z < 0.f;
    return isCoordInView;
 }

--- a/modules/skybrowser/src/wwtcommunicator.cpp
+++ b/modules/skybrowser/src/wwtcommunicator.cpp
@@ -290,11 +290,10 @@ glm::dvec2 WwtCommunicator::equatorialAim() const {
    return _equatorialAim;
 }

-void WwtCommunicator::setImageOrder(int i, int order) {
+void WwtCommunicator::setImageOrder(int image, int order) {
    // Find in selected images list
-    auto current = findSelectedImage(i);
-    int currentIndex = std::distance(_selectedImages.begin(), current);
-    int difference = order - currentIndex;
+    auto current = findSelectedImage(image);
+    int currentIndex = static_cast<int>(std::distance(_selectedImages.begin(), current));

    std::deque<std::pair<int, double>> newDeque;

@@ -319,7 +318,7 @@ void WwtCommunicator::setImageOrder(int i, int order) {

    _selectedImages = newDeque;
    int reverseOrder = static_cast<int>(_selectedImages.size()) - order - 1;
-    ghoul::Dictionary message = setLayerOrderMessage(std::to_string(i), reverseOrder);
+    ghoul::Dictionary message = setLayerOrderMessage(std::to_string(image), reverseOrder);
    sendMessageToWwt(message);
 }

--- a/modules/skybrowser/src/wwtdatahandler.cpp
+++ b/modules/skybrowser/src/wwtdatahandler.cpp
@@ -28,18 +28,7 @@
 #include <openspace/util/httprequest.h>
 #include <ghoul/logging/logmanager.h>
 #include <string_view>
-
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wsuggest-override"
-#pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
-#endif
-
-#include <modules/skybrowser/ext/tinyxml2/tinyxml2.h>
-
-#if defined(__GNUC__) && !defined(__clang__)
-#pragma GCC diagnostic pop
-#endif
+#include <tinyxml2.h>

 namespace {
    constexpr std::string_view _loggerCat = "WwtDataHandler";
--- a/modules/space/CMakeLists.txt
+++ b/modules/space/CMakeLists.txt
@@ -22,7 +22,7 @@
 # OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                          #
 ##########################################################################################

-include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
+include(${PROJECT_SOURCE_DIR}/support/cmake/module_definition.cmake)

 set(HEADER_FILES
  horizonsfile.h
--- a/modules/space/labelscomponent.cpp
+++ b/modules/space/labelscomponent.cpp
@@ -45,12 +45,6 @@ namespace {
        "The speck label file with the data for the labels"
    };

-    constexpr openspace::properties::Property::PropertyInfo UnitInfo = {
-        "Unit",
-        "Unit",
-        "Distance unit for the label data"
-    };
-
    constexpr openspace::properties::Property::PropertyInfo OpacityInfo = {
        "Opacity",
        "Opacity",
--- a/modules/space/rendering/renderableconstellationlines.cpp
+++ b/modules/space/rendering/renderableconstellationlines.cpp
@@ -103,8 +103,8 @@ documentation::Documentation RenderableConstellationLines::Documentation() {
 RenderableConstellationLines::RenderableConstellationLines(
                                                      const ghoul::Dictionary& dictionary)
    : RenderableConstellationsBase(dictionary)
-    , _speckFile(SpeckInfo)
    , _drawElements(DrawElementsInfo, true)
+    , _speckFile(SpeckInfo)
 {
    const Parameters p = codegen::bake<Parameters>(dictionary);

@@ -382,7 +382,6 @@ bool RenderableConstellationLines::readSpeckFile() {

                // Try to read three values for the position
                glm::vec3 pos;
-                bool success = true;
                auto reading = scn::scan(line, "{} {} {}", pos.x, pos.y, pos.z);
                if (reading) {
                    pos *= scale;
@@ -391,7 +390,6 @@ bool RenderableConstellationLines::readSpeckFile() {
                    constellationLine.vertices.push_back(pos.z);
                }
                else {
-                    success = false;
                    LERROR(fmt::format(
                        "Failed reading position on line {} of mesh {} in file: '{}'. "
                        "Stopped reading constellation data", l, lineIndex, fileName
--- a/modules/space/rendering/renderableconstellationsbase.cpp
+++ b/modules/space/rendering/renderableconstellationsbase.cpp
@@ -98,10 +98,10 @@ documentation::Documentation RenderableConstellationsBase::Documentation() {
 RenderableConstellationsBase::RenderableConstellationsBase(
                                                      const ghoul::Dictionary& dictionary)
    : Renderable(dictionary)
-    , _drawLabels(DrawLabelInfo, false)
    , _lineWidth(LineWidthInfo, 2.f, 1.f, 16.f)
-    , _namesFilename(NamesFileInfo)
    , _selection(SelectionInfo)
+    , _drawLabels(DrawLabelInfo, false)
+    , _namesFilename(NamesFileInfo)
 {
    const Parameters p = codegen::bake<Parameters>(dictionary);

@@ -188,7 +188,7 @@ void RenderableConstellationsBase::loadConstellationFile() {
 }

 void RenderableConstellationsBase::fillSelectionProperty() {
-    for (const std::pair<std::string, std::string>& pair : _namesTranslation) {
+    for (const std::pair<const std::string, std::string>& pair : _namesTranslation) {
        _selection.addOption(pair.second);
    }
 }
--- a/modules/space/rendering/renderableorbitalkepler.cpp
+++ b/modules/space/rendering/renderableorbitalkepler.cpp
@@ -304,7 +304,7 @@ void RenderableOrbitalKepler::updateBuffers() {

    _numObjects = parameters.size();

-    if (_startRenderIdx < 0 || _startRenderIdx >= _numObjects) {
+    if (_startRenderIdx >= _numObjects) {
        throw ghoul::RuntimeError(fmt::format(
            "Start index {} out of range [0, {}]", _startRenderIdx, _numObjects
        ));
--- a/modules/space/rendering/renderableorbitalkepler.h
+++ b/modules/space/rendering/renderableorbitalkepler.h
@@ -57,7 +57,6 @@ private:
    void updateBuffers();

    bool _updateDataBuffersAtNextRender = false;
-    bool _isFileReadinitialized = false;
    std::streamoff _numObjects;
    std::vector<size_t> _segmentSize;
    properties::UIntProperty _segmentQuality;
--- a/modules/space/translation/gptranslation.cpp
+++ b/modules/space/translation/gptranslation.cpp
@@ -70,7 +70,7 @@ GPTranslation::GPTranslation(const ghoul::Dictionary& dictionary) {
        p.file,
        codegen::map<kepler::Format>(p.format)
    );
-    if (parameters.size() < element) {
+    if (element >= static_cast<int>(parameters.size())) {
        throw ghoul::RuntimeError(fmt::format(
            "Requested element {} but only {} are available", element, parameters.size()
        ));
--- a/modules/spacecraftinstruments/CMakeLists.txt
+++ b/modules/spacecraftinstruments/CMakeLists.txt
@@ -22,9 +22,9 @@
 # OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                          #
 ##########################################################################################

-include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
+include(${PROJECT_SOURCE_DIR}/support/cmake/module_definition.cmake)

-set(HEADER_FILES    
+set(HEADER_FILES
  dashboard/dashboarditeminstruments.h
  rendering/renderablecrawlingline.h
  rendering/renderablefov.h
--- a/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp
+++ b/modules/spacecraftinstruments/rendering/renderableplanetprojection.cpp
@@ -39,8 +39,6 @@
 #include <ghoul/opengl/textureunit.h>

 namespace {
-    constexpr std::string_view _loggerCat = "RenderablePlanetProjection";
-
    constexpr std::array<const char*, 12> MainUniformNames = {
        "sun_pos", "modelTransform", "modelViewProjectionTransform", "hasBaseMap",
        "hasHeightMap", "heightExaggeration", "meridianShift", "ambientBrightness",
@@ -52,7 +50,6 @@ namespace {
        "boresight", "radius", "segments"
    };

-    constexpr std::string_view KeyRadius = "Geometry.Radius";
    constexpr std::string_view NoImageText = "No Image";

    constexpr openspace::properties::Property::PropertyInfo ColorTexturePathsInfo = {
--- a/modules/spout/CMakeLists.txt
+++ b/modules/spout/CMakeLists.txt
@@ -22,7 +22,7 @@
 # OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                          #
 ##########################################################################################

-include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
+include(${PROJECT_SOURCE_DIR}/support/cmake/module_definition.cmake)

 set(HEADER_FILES
  renderableplanespout.h
--- a/modules/statemachine/CMakeLists.txt
+++ b/modules/statemachine/CMakeLists.txt
@@ -22,7 +22,7 @@
 # OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                          #
 ##########################################################################################

-include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
+include(${PROJECT_SOURCE_DIR}/support/cmake/module_definition.cmake)

 set(HEADER_FILES
  ${CMAKE_CURRENT_SOURCE_DIR}/include/state.h
--- a/modules/sync/CMakeLists.txt
+++ b/modules/sync/CMakeLists.txt
@@ -22,7 +22,7 @@
 # OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                          #
 ##########################################################################################

-include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
+include(${PROJECT_SOURCE_DIR}/support/cmake/module_definition.cmake)

 set(HEADER_FILES
  syncmodule.h
--- a/modules/touch/CMakeLists.txt
+++ b/modules/touch/CMakeLists.txt
@@ -22,7 +22,7 @@
 # OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                          #
 ##########################################################################################

-include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
+include(${PROJECT_SOURCE_DIR}/support/cmake/module_definition.cmake)

 set(HEADER_FILES
  ext/levmarq.h
@@ -57,5 +57,6 @@ create_new_module(
  ${HEADER_FILES} ${SOURCE_FILES} ${SHADER_FILES}
 )

-include_external_library(${touch_module} PRIVATE libTUIO11 ${CMAKE_CURRENT_SOURCE_DIR}/ext)
-disable_external_warnings_for_file(${CMAKE_CURRENT_SOURCE_DIR}/ext/levmarq.cpp)
+add_subdirectory(ext SYSTEM)
+target_link_libraries(${touch_module} PRIVATE libTUIO11)
+set_target_properties(libTUIO11 PROPERTIES FOLDER "External")
--- a/modules/toyvolume/CMakeLists.txt
+++ b/modules/toyvolume/CMakeLists.txt
@@ -22,7 +22,7 @@
 # OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                          #
 ##########################################################################################

-include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
+include(${PROJECT_SOURCE_DIR}/support/cmake/module_definition.cmake)

 set(HEADER_FILES
  rendering/renderabletoyvolume.h
--- a/modules/vislab/CMakeLists.txt
+++ b/modules/vislab/CMakeLists.txt
@@ -22,7 +22,7 @@
 # OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                          #
 ##########################################################################################

-include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
+include(${PROJECT_SOURCE_DIR}/support/cmake/module_definition.cmake)

 set(HEADER_FILES
  rendering/renderabledistancelabel.h
--- a/modules/volume/CMakeLists.txt
+++ b/modules/volume/CMakeLists.txt
@@ -22,7 +22,7 @@
 # OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                          #
 ##########################################################################################

-include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
+include(${PROJECT_SOURCE_DIR}/support/cmake/module_definition.cmake)

 set(HEADER_FILES
  envelope.h
--- a/modules/webbrowser/CMakeLists.txt
+++ b/modules/webbrowser/CMakeLists.txt
@@ -22,10 +22,7 @@
 # OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                          #
 ##########################################################################################

-cmake_minimum_required(VERSION 3.12 FATAL_ERROR)
-
-include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
-include(${GHOUL_BASE_DIR}/support/cmake/handle_external_library.cmake)
+include(${PROJECT_SOURCE_DIR}/support/cmake/module_definition.cmake)
 include(cmake/webbrowser_helpers.cmake)

 set(WEBBROWSER_MODULE_NAME WebBrowser)
@@ -90,14 +87,11 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CEF_ROOT}/cmake")
 find_package(CEF REQUIRED)

 # Include the libcef_dll_wrapper target (executes libcef_dll/CMakeLists.txt).
-add_subdirectory(${CEF_LIBCEF_DLL_WRAPPER_PATH} libcef_dll_wrapper)
+add_subdirectory(${CEF_LIBCEF_DLL_WRAPPER_PATH} libcef_dll_wrapper SYSTEM)

 mark_as_advanced(CEF_DEBUG_INFO_FLAG USE_ATL USE_OFFICIAL_BUILD_SANDBOX USE_SANDBOX)

-if (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
-  # The CEF DLL wrapper is raising a lot of warnings on GCC
-  target_compile_options(libcef_dll_wrapper PRIVATE "-w")
-endif ()
+target_compile_options(libcef_dll_wrapper PRIVATE "-w")

 target_precompile_headers(libcef_dll_wrapper PRIVATE
  [["include/cef_client.h"]]
@@ -266,8 +260,7 @@ target_precompile_headers(${webbrowser_module} PRIVATE
  <include/wrapper/cef_helpers.h>
 )

-set_folder_location(libcef_dll_wrapper "Helper")
-set_folder_location(openspace_web_helper "Helper")
+set_target_properties(libcef_dll_wrapper PROPERTIES FOLDER "Helper")

 # Display CEF configuration settings.
 # PRINT_CEF_CONFIG()
--- a/modules/webbrowser/src/eventhandler.cpp
+++ b/modules/webbrowser/src/eventhandler.cpp
@@ -373,8 +373,8 @@ bool EventHandler::isDoubleClick(const MouseButtonState& button) const {

    // check position
    const float maxDist = maxDoubleClickDistance() / 2.f;
-    const bool x = abs(_mousePosition.x - button.lastClickPosition.x) < maxDist;
-    const bool y = abs(_mousePosition.y - button.lastClickPosition.y) < maxDist;
+    const bool x = std::abs(_mousePosition.x - button.lastClickPosition.x) < maxDist;
+    const bool y = std::abs(_mousePosition.y - button.lastClickPosition.y) < maxDist;

    return x && y;
 }
--- a/modules/webgui/CMakeLists.txt
+++ b/modules/webgui/CMakeLists.txt
@@ -22,7 +22,7 @@
 # OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                          #
 ##########################################################################################

-include(${OPENSPACE_CMAKE_EXT_DIR}/module_definition.cmake)
+include(${PROJECT_SOURCE_DIR}/support/cmake/module_definition.cmake)
 include(../webbrowser/cmake/webbrowser_helpers.cmake)

 set(WEBGUI_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "WEBGUI_MODULE_PATH")
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -22,378 +22,378 @@
 # OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                          #
 ##########################################################################################

-include(${OPENSPACE_CMAKE_EXT_DIR}/set_openspace_compile_settings.cmake)
+include(${PROJECT_SOURCE_DIR}/support/cmake/set_openspace_compile_settings.cmake)

 set(OPENSPACE_SOURCE
-  ${OPENSPACE_BASE_DIR}/src/openspace.cpp
-  ${OPENSPACE_BASE_DIR}/src/camera/camera.cpp
-  ${OPENSPACE_BASE_DIR}/src/documentation/core_registration.cpp
-  ${OPENSPACE_BASE_DIR}/src/documentation/documentation.cpp
-  ${OPENSPACE_BASE_DIR}/src/documentation/documentationengine.cpp
-  ${OPENSPACE_BASE_DIR}/src/documentation/documentationgenerator.cpp
-  ${OPENSPACE_BASE_DIR}/src/documentation/verifier.cpp
-  ${OPENSPACE_BASE_DIR}/src/engine/configuration.cpp
-  ${OPENSPACE_BASE_DIR}/src/engine/downloadmanager.cpp
-  ${OPENSPACE_BASE_DIR}/src/engine/globals.cpp
-  ${OPENSPACE_BASE_DIR}/src/engine/globalscallbacks.cpp
-  ${OPENSPACE_BASE_DIR}/src/engine/logfactory.cpp
-  ${OPENSPACE_BASE_DIR}/src/engine/moduleengine.cpp
-  ${OPENSPACE_BASE_DIR}/src/engine/moduleengine_lua.inl
-  ${OPENSPACE_BASE_DIR}/src/engine/openspaceengine.cpp
-  ${OPENSPACE_BASE_DIR}/src/engine/openspaceengine_lua.inl
-  ${OPENSPACE_BASE_DIR}/src/engine/syncengine.cpp
-  ${OPENSPACE_BASE_DIR}/src/events/event.cpp
-  ${OPENSPACE_BASE_DIR}/src/events/eventengine.cpp
-  ${OPENSPACE_BASE_DIR}/src/events/eventengine_lua.inl
-  ${OPENSPACE_BASE_DIR}/src/interaction/actionmanager.cpp
-  ${OPENSPACE_BASE_DIR}/src/interaction/actionmanager_lua.inl
-  ${OPENSPACE_BASE_DIR}/src/interaction/camerainteractionstates.cpp
-  ${OPENSPACE_BASE_DIR}/src/interaction/interactionmonitor.cpp
-  ${OPENSPACE_BASE_DIR}/src/interaction/mouseinputstate.cpp
-  ${OPENSPACE_BASE_DIR}/src/interaction/joystickinputstate.cpp
-  ${OPENSPACE_BASE_DIR}/src/interaction/joystickcamerastates.cpp
-  ${OPENSPACE_BASE_DIR}/src/interaction/keybindingmanager.cpp
-  ${OPENSPACE_BASE_DIR}/src/interaction/keybindingmanager_lua.inl
-  ${OPENSPACE_BASE_DIR}/src/interaction/keyboardinputstate.cpp
-  ${OPENSPACE_BASE_DIR}/src/interaction/mousecamerastates.cpp
-  ${OPENSPACE_BASE_DIR}/src/interaction/scriptcamerastates.cpp
-  ${OPENSPACE_BASE_DIR}/src/interaction/sessionrecording.cpp
-  ${OPENSPACE_BASE_DIR}/src/interaction/sessionrecording_lua.inl
-  ${OPENSPACE_BASE_DIR}/src/interaction/websocketinputstate.cpp
-  ${OPENSPACE_BASE_DIR}/src/interaction/websocketcamerastates.cpp
-  ${OPENSPACE_BASE_DIR}/src/interaction/tasks/convertrecfileversiontask.cpp
-  ${OPENSPACE_BASE_DIR}/src/interaction/tasks/convertrecformattask.cpp
-  ${OPENSPACE_BASE_DIR}/src/mission/mission.cpp
-  ${OPENSPACE_BASE_DIR}/src/mission/missionmanager.cpp
-  ${OPENSPACE_BASE_DIR}/src/mission/missionmanager_lua.inl
-  ${OPENSPACE_BASE_DIR}/src/navigation/pathcurves/avoidcollisioncurve.cpp
-  ${OPENSPACE_BASE_DIR}/src/navigation/pathcurves/zoomoutoverviewcurve.cpp
-  ${OPENSPACE_BASE_DIR}/src/navigation/keyframenavigator.cpp
-  ${OPENSPACE_BASE_DIR}/src/navigation/navigationhandler.cpp
-  ${OPENSPACE_BASE_DIR}/src/navigation/navigationhandler_lua.inl
-  ${OPENSPACE_BASE_DIR}/src/navigation/navigationstate.cpp
-  ${OPENSPACE_BASE_DIR}/src/navigation/orbitalnavigator.cpp
-  ${OPENSPACE_BASE_DIR}/src/navigation/path.cpp
-  ${OPENSPACE_BASE_DIR}/src/navigation/pathcurve.cpp
-  ${OPENSPACE_BASE_DIR}/src/navigation/pathnavigator.cpp
-  ${OPENSPACE_BASE_DIR}/src/navigation/pathnavigator_lua.inl
-  ${OPENSPACE_BASE_DIR}/src/navigation/waypoint.cpp
-  ${OPENSPACE_BASE_DIR}/src/network/messagestructureshelper.cpp
-  ${OPENSPACE_BASE_DIR}/src/network/parallelconnection.cpp
-  ${OPENSPACE_BASE_DIR}/src/network/parallelpeer.cpp
-  ${OPENSPACE_BASE_DIR}/src/network/parallelpeer_lua.inl
-  ${OPENSPACE_BASE_DIR}/src/properties/optionproperty.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/property.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/propertyowner.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/selectionproperty.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/stringproperty.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/triggerproperty.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/list/doublelistproperty.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/list/intlistproperty.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/list/stringlistproperty.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/matrix/dmat2property.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/matrix/dmat3property.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/matrix/dmat4property.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/matrix/mat2property.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/matrix/mat3property.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/matrix/mat4property.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/scalar/boolproperty.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/scalar/doubleproperty.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/scalar/floatproperty.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/scalar/intproperty.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/scalar/longproperty.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/scalar/shortproperty.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/scalar/uintproperty.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/scalar/ulongproperty.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/scalar/ushortproperty.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/vector/dvec2property.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/vector/dvec3property.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/vector/dvec4property.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/vector/ivec2property.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/vector/ivec3property.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/vector/ivec4property.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/vector/uvec2property.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/vector/uvec3property.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/vector/uvec4property.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/vector/vec2property.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/vector/vec3property.cpp
-  ${OPENSPACE_BASE_DIR}/src/properties/vector/vec4property.cpp
-  ${OPENSPACE_BASE_DIR}/src/query/query.cpp
-  ${OPENSPACE_BASE_DIR}/src/rendering/dashboard.cpp
-  ${OPENSPACE_BASE_DIR}/src/rendering/dashboard_lua.inl
-  ${OPENSPACE_BASE_DIR}/src/rendering/dashboarditem.cpp
-  ${OPENSPACE_BASE_DIR}/src/rendering/dashboardtextitem.cpp
-  ${OPENSPACE_BASE_DIR}/src/rendering/framebufferrenderer.cpp
-  ${OPENSPACE_BASE_DIR}/src/rendering/deferredcastermanager.cpp
-  ${OPENSPACE_BASE_DIR}/src/rendering/helper.cpp
-  ${OPENSPACE_BASE_DIR}/src/rendering/loadingscreen.cpp
-  ${OPENSPACE_BASE_DIR}/src/rendering/luaconsole.cpp
-  ${OPENSPACE_BASE_DIR}/src/rendering/raycastermanager.cpp
-  ${OPENSPACE_BASE_DIR}/src/rendering/renderable.cpp
-  ${OPENSPACE_BASE_DIR}/src/rendering/renderengine.cpp
-  ${OPENSPACE_BASE_DIR}/src/rendering/renderengine_lua.inl
-  ${OPENSPACE_BASE_DIR}/src/rendering/screenspacerenderable.cpp
-  ${OPENSPACE_BASE_DIR}/src/rendering/texturecomponent.cpp
-  ${OPENSPACE_BASE_DIR}/src/rendering/transferfunction.cpp
-  ${OPENSPACE_BASE_DIR}/src/rendering/volumeraycaster.cpp
-  ${OPENSPACE_BASE_DIR}/src/scene/asset.cpp
-  ${OPENSPACE_BASE_DIR}/src/scene/assetmanager.cpp
-  ${OPENSPACE_BASE_DIR}/src/scene/assetmanager_lua.inl
-  ${OPENSPACE_BASE_DIR}/src/scene/lightsource.cpp
-  ${OPENSPACE_BASE_DIR}/src/scene/profile.cpp
-  ${OPENSPACE_BASE_DIR}/src/scene/profile_lua.inl
-  ${OPENSPACE_BASE_DIR}/src/scene/rotation.cpp
-  ${OPENSPACE_BASE_DIR}/src/scene/scale.cpp
-  ${OPENSPACE_BASE_DIR}/src/scene/scene.cpp
-  ${OPENSPACE_BASE_DIR}/src/scene/scene_lua.inl
-  ${OPENSPACE_BASE_DIR}/src/scene/sceneinitializer.cpp
-  ${OPENSPACE_BASE_DIR}/src/scene/scenelicensewriter.cpp
-  ${OPENSPACE_BASE_DIR}/src/scene/scenegraphnode.cpp
-  ${OPENSPACE_BASE_DIR}/src/scene/timeframe.cpp
-  ${OPENSPACE_BASE_DIR}/src/scene/translation.cpp
-  ${OPENSPACE_BASE_DIR}/src/scripting/lualibrary.cpp
-  ${OPENSPACE_BASE_DIR}/src/scripting/scriptengine.cpp
-  ${OPENSPACE_BASE_DIR}/src/scripting/scriptengine_lua.inl
-  ${OPENSPACE_BASE_DIR}/src/scripting/scriptscheduler.cpp
-  ${OPENSPACE_BASE_DIR}/src/scripting/scriptscheduler_lua.inl
-  ${OPENSPACE_BASE_DIR}/src/scripting/systemcapabilitiesbinding.cpp
-  ${OPENSPACE_BASE_DIR}/src/scripting/systemcapabilitiesbinding_lua.inl
-  ${OPENSPACE_BASE_DIR}/src/util/blockplaneintersectiongeometry.cpp
-  ${OPENSPACE_BASE_DIR}/src/util/boxgeometry.cpp
-  ${OPENSPACE_BASE_DIR}/src/util/collisionhelper.cpp
-  ${OPENSPACE_BASE_DIR}/src/util/coordinateconversion.cpp
-  ${OPENSPACE_BASE_DIR}/src/util/distanceconversion.cpp
-  ${OPENSPACE_BASE_DIR}/src/util/factorymanager.cpp
-  ${OPENSPACE_BASE_DIR}/src/util/httprequest.cpp
-  ${OPENSPACE_BASE_DIR}/src/util/json_helper.cpp
-  ${OPENSPACE_BASE_DIR}/src/util/keys.cpp
-  ${OPENSPACE_BASE_DIR}/src/util/openspacemodule.cpp
-  ${OPENSPACE_BASE_DIR}/src/util/planegeometry.cpp
-  ${OPENSPACE_BASE_DIR}/src/util/progressbar.cpp
-  ${OPENSPACE_BASE_DIR}/src/util/resourcesynchronization.cpp
-  ${OPENSPACE_BASE_DIR}/src/util/screenlog.cpp
-  ${OPENSPACE_BASE_DIR}/src/util/sphere.cpp
-  ${OPENSPACE_BASE_DIR}/src/util/spicemanager.cpp
-  ${OPENSPACE_BASE_DIR}/src/util/spicemanager_lua.inl
-  ${OPENSPACE_BASE_DIR}/src/util/syncbuffer.cpp
-  ${OPENSPACE_BASE_DIR}/src/util/tstring.cpp
-  ${OPENSPACE_BASE_DIR}/src/util/histogram.cpp
-  ${OPENSPACE_BASE_DIR}/src/util/task.cpp
-  ${OPENSPACE_BASE_DIR}/src/util/taskloader.cpp
-  ${OPENSPACE_BASE_DIR}/src/util/threadpool.cpp
-  ${OPENSPACE_BASE_DIR}/src/util/time.cpp
-  ${OPENSPACE_BASE_DIR}/src/util/timeconversion.cpp
-  ${OPENSPACE_BASE_DIR}/src/util/timeline.cpp
-  ${OPENSPACE_BASE_DIR}/src/util/timemanager.cpp
-  ${OPENSPACE_BASE_DIR}/src/util/time_lua.inl
-  ${OPENSPACE_BASE_DIR}/src/util/timerange.cpp
-  ${OPENSPACE_BASE_DIR}/src/util/touch.cpp
-  ${OPENSPACE_BASE_DIR}/src/util/transformationmanager.cpp
-  ${OPENSPACE_BASE_DIR}/src/util/universalhelpers.cpp
-  ${OPENSPACE_BASE_DIR}/src/util/versionchecker.cpp
+  openspace.cpp
+  camera/camera.cpp
+  documentation/core_registration.cpp
+  documentation/documentation.cpp
+  documentation/documentationengine.cpp
+  documentation/documentationgenerator.cpp
+  documentation/verifier.cpp
+  engine/configuration.cpp
+  engine/downloadmanager.cpp
+  engine/globals.cpp
+  engine/globalscallbacks.cpp
+  engine/logfactory.cpp
+  engine/moduleengine.cpp
+  engine/moduleengine_lua.inl
+  engine/openspaceengine.cpp
+  engine/openspaceengine_lua.inl
+  engine/syncengine.cpp
+  events/event.cpp
+  events/eventengine.cpp
+  events/eventengine_lua.inl
+  interaction/actionmanager.cpp
+  interaction/actionmanager_lua.inl
+  interaction/camerainteractionstates.cpp
+  interaction/interactionmonitor.cpp
+  interaction/mouseinputstate.cpp
+  interaction/joystickinputstate.cpp
+  interaction/joystickcamerastates.cpp
+  interaction/keybindingmanager.cpp
+  interaction/keybindingmanager_lua.inl
+  interaction/keyboardinputstate.cpp
+  interaction/mousecamerastates.cpp
+  interaction/scriptcamerastates.cpp
+  interaction/sessionrecording.cpp
+  interaction/sessionrecording_lua.inl
+  interaction/websocketinputstate.cpp
+  interaction/websocketcamerastates.cpp
+  interaction/tasks/convertrecfileversiontask.cpp
+  interaction/tasks/convertrecformattask.cpp
+  mission/mission.cpp
+  mission/missionmanager.cpp
+  mission/missionmanager_lua.inl
+  navigation/pathcurves/avoidcollisioncurve.cpp
+  navigation/pathcurves/zoomoutoverviewcurve.cpp
+  navigation/keyframenavigator.cpp
+  navigation/navigationhandler.cpp
+  navigation/navigationhandler_lua.inl
+  navigation/navigationstate.cpp
+  navigation/orbitalnavigator.cpp
+  navigation/path.cpp
+  navigation/pathcurve.cpp
+  navigation/pathnavigator.cpp
+  navigation/pathnavigator_lua.inl
+  navigation/waypoint.cpp
+  network/messagestructureshelper.cpp
+  network/parallelconnection.cpp
+  network/parallelpeer.cpp
+  network/parallelpeer_lua.inl
+  properties/optionproperty.cpp
+  properties/property.cpp
+  properties/propertyowner.cpp
+  properties/selectionproperty.cpp
+  properties/stringproperty.cpp
+  properties/triggerproperty.cpp
+  properties/list/doublelistproperty.cpp
+  properties/list/intlistproperty.cpp
+  properties/list/stringlistproperty.cpp
+  properties/matrix/dmat2property.cpp
+  properties/matrix/dmat3property.cpp
+  properties/matrix/dmat4property.cpp
+  properties/matrix/mat2property.cpp
+  properties/matrix/mat3property.cpp
+  properties/matrix/mat4property.cpp
+  properties/scalar/boolproperty.cpp
+  properties/scalar/doubleproperty.cpp
+  properties/scalar/floatproperty.cpp
+  properties/scalar/intproperty.cpp
+  properties/scalar/longproperty.cpp
+  properties/scalar/shortproperty.cpp
+  properties/scalar/uintproperty.cpp
+  properties/scalar/ulongproperty.cpp
+  properties/scalar/ushortproperty.cpp
+  properties/vector/dvec2property.cpp
+  properties/vector/dvec3property.cpp
+  properties/vector/dvec4property.cpp
+  properties/vector/ivec2property.cpp
+  properties/vector/ivec3property.cpp
+  properties/vector/ivec4property.cpp
+  properties/vector/uvec2property.cpp
+  properties/vector/uvec3property.cpp
+  properties/vector/uvec4property.cpp
+  properties/vector/vec2property.cpp
+  properties/vector/vec3property.cpp
+  properties/vector/vec4property.cpp
+  query/query.cpp
+  rendering/dashboard.cpp
+  rendering/dashboard_lua.inl
+  rendering/dashboarditem.cpp
+  rendering/dashboardtextitem.cpp
+  rendering/framebufferrenderer.cpp
+  rendering/deferredcastermanager.cpp
+  rendering/helper.cpp
+  rendering/loadingscreen.cpp
+  rendering/luaconsole.cpp
+  rendering/raycastermanager.cpp
+  rendering/renderable.cpp
+  rendering/renderengine.cpp
+  rendering/renderengine_lua.inl
+  rendering/screenspacerenderable.cpp
+  rendering/texturecomponent.cpp
+  rendering/transferfunction.cpp
+  rendering/volumeraycaster.cpp
+  scene/asset.cpp
+  scene/assetmanager.cpp
+  scene/assetmanager_lua.inl
+  scene/lightsource.cpp
+  scene/profile.cpp
+  scene/profile_lua.inl
+  scene/rotation.cpp
+  scene/scale.cpp
+  scene/scene.cpp
+  scene/scene_lua.inl
+  scene/sceneinitializer.cpp
+  scene/scenelicensewriter.cpp
+  scene/scenegraphnode.cpp
+  scene/timeframe.cpp
+  scene/translation.cpp
+  scripting/lualibrary.cpp
+  scripting/scriptengine.cpp
+  scripting/scriptengine_lua.inl
+  scripting/scriptscheduler.cpp
+  scripting/scriptscheduler_lua.inl
+  scripting/systemcapabilitiesbinding.cpp
+  scripting/systemcapabilitiesbinding_lua.inl
+  util/blockplaneintersectiongeometry.cpp
+  util/boxgeometry.cpp
+  util/collisionhelper.cpp
+  util/coordinateconversion.cpp
+  util/distanceconversion.cpp
+  util/factorymanager.cpp
+  util/httprequest.cpp
+  util/json_helper.cpp
+  util/keys.cpp
+  util/openspacemodule.cpp
+  util/planegeometry.cpp
+  util/progressbar.cpp
+  util/resourcesynchronization.cpp
+  util/screenlog.cpp
+  util/sphere.cpp
+  util/spicemanager.cpp
+  util/spicemanager_lua.inl
+  util/syncbuffer.cpp
+  util/tstring.cpp
+  util/histogram.cpp
+  util/task.cpp
+  util/taskloader.cpp
+  util/threadpool.cpp
+  util/time.cpp
+  util/timeconversion.cpp
+  util/timeline.cpp
+  util/timemanager.cpp
+  util/time_lua.inl
+  util/timerange.cpp
+  util/touch.cpp
+  util/transformationmanager.cpp
+  util/universalhelpers.cpp
+  util/versionchecker.cpp
 )

 if (APPLE)
  set(OPENSPACE_SOURCE
    ${OPENSPACE_SOURCE}
-    ${OPENSPACE_BASE_DIR}/src/interaction/touchbar.mm
+    interaction/touchbar.mm
  )
  set_source_files_properties(
-    ${OPENSPACE_BASE_DIR}/src/interaction/touchbar.mm
+    interaction/touchbar.mm
    PROPERTIES SKIP_PRECOMPILE_HEADERS ON
  )
 endif ()
 set(OPENSPACE_HEADER
-  ${OPENSPACE_BASE_DIR}/include/openspace/json.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/camera/camera.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/camera/camerapose.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/documentation/core_registration.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/documentation/documentation.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/documentation/documentationengine.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/documentation/documentationgenerator.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/documentation/verifier.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/documentation/verifier.inl
-  ${OPENSPACE_BASE_DIR}/include/openspace/engine/configuration.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/engine/downloadmanager.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/engine/globals.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/engine/globalscallbacks.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/engine/logfactory.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/engine/moduleengine.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/engine/moduleengine.inl
-  ${OPENSPACE_BASE_DIR}/include/openspace/engine/openspaceengine.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/engine/syncengine.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/engine/windowdelegate.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/events/event.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/events/eventengine.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/events/eventengine.inl
-  ${OPENSPACE_BASE_DIR}/include/openspace/interaction/action.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/interaction/actionmanager.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/interaction/delayedvariable.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/interaction/delayedvariable.inl
-  ${OPENSPACE_BASE_DIR}/include/openspace/interaction/camerainteractionstates.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/interaction/mouseinputstate.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/interaction/interactionmonitor.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/interaction/interpolator.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/interaction/interpolator.inl
-  ${OPENSPACE_BASE_DIR}/include/openspace/interaction/joystickinputstate.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/interaction/joystickcamerastates.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/interaction/keybindingmanager.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/interaction/keyboardinputstate.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/interaction/mousecamerastates.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/interaction/scriptcamerastates.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/interaction/sessionrecording.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/interaction/sessionrecording.inl
-  ${OPENSPACE_BASE_DIR}/include/openspace/interaction/websocketinputstate.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/interaction/websocketcamerastates.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/interaction/tasks/convertrecfileversiontask.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/interaction/tasks/convertrecformattask.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/mission/mission.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/mission/missionmanager.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/navigation/pathcurves/avoidcollisioncurve.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/navigation/pathcurves/zoomoutoverviewcurve.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/navigation/keyframenavigator.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/navigation/navigationhandler.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/navigation/navigationstate.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/navigation/orbitalnavigator.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/navigation/path.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/navigation/pathcurve.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/navigation/pathnavigator.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/navigation/waypoint.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/network/parallelconnection.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/network/parallelpeer.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/network/messagestructures.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/network/messagestructureshelper.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/listproperty.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/listproperty.inl
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/numericalproperty.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/numericalproperty.inl
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/optionproperty.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/property.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/propertyowner.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/selectionproperty.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/stringproperty.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/templateproperty.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/templateproperty.inl
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/triggerproperty.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/list/doublelistproperty.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/list/intlistproperty.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/list/stringlistproperty.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/dmat2property.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/dmat3property.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/dmat4property.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/mat2property.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/mat3property.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/matrix/mat4property.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/boolproperty.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/doubleproperty.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/floatproperty.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/intproperty.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/longproperty.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/shortproperty.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/uintproperty.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/ulongproperty.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/scalar/ushortproperty.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/dvec2property.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/dvec3property.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/dvec4property.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/ivec2property.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/ivec3property.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/ivec4property.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/uvec2property.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/uvec3property.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/uvec4property.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/vec2property.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/vec3property.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/properties/vector/vec4property.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/query/query.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/rendering/dashboard.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/rendering/dashboarditem.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/rendering/dashboardtextitem.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/rendering/framebufferrenderer.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/rendering/deferredcaster.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/rendering/deferredcasterlistener.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/rendering/deferredcastermanager.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/rendering/loadingscreen.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/rendering/luaconsole.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/rendering/helper.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/rendering/raycasterlistener.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/rendering/raycastermanager.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/rendering/renderable.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/rendering/renderengine.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/rendering/screenspacerenderable.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/rendering/texturecomponent.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/rendering/transferfunction.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/rendering/volume.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/rendering/volumeraycaster.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/scene/asset.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/scene/assetmanager.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/scene/lightsource.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/scene/profile.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/scene/rotation.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/scene/scale.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/scene/scene.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/scene/sceneinitializer.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/scene/scenelicensewriter.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/scene/scenegraphnode.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/scene/timeframe.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/scene/translation.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/scripting/lualibrary.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/scripting/scriptengine.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/scripting/scriptscheduler.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/scripting/systemcapabilitiesbinding.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/util/blockplaneintersectiongeometry.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/util/boxgeometry.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/util/collisionhelper.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/util/concurrentjobmanager.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/util/concurrentjobmanager.inl
-  ${OPENSPACE_BASE_DIR}/include/openspace/util/concurrentqueue.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/util/concurrentqueue.inl
-  ${OPENSPACE_BASE_DIR}/include/openspace/util/coordinateconversion.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/util/distanceconstants.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/util/distanceconversion.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/util/factorymanager.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/util/factorymanager.inl
-  ${OPENSPACE_BASE_DIR}/include/openspace/util/httprequest.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/util/job.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/util/json_helper.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/util/json_helper.inl
-  ${OPENSPACE_BASE_DIR}/include/openspace/util/keys.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/util/memorymanager.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/util/mouse.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/util/openspacemodule.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/util/planegeometry.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/util/progressbar.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/util/resourcesynchronization.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/util/screenlog.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/util/sphere.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/util/spicemanager.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/util/syncable.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/util/syncbuffer.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/util/syncbuffer.inl
-  ${OPENSPACE_BASE_DIR}/include/openspace/util/syncdata.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/util/syncdata.inl
-  ${OPENSPACE_BASE_DIR}/include/openspace/util/task.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/util/taskloader.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/util/time.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/util/timeconversion.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/util/timeline.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/util/timeline.inl
-  ${OPENSPACE_BASE_DIR}/include/openspace/util/timemanager.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/util/timerange.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/util/touch.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/util/tstring.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/util/universalhelpers.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/util/updatestructures.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/util/versionchecker.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/util/transformationmanager.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/util/threadpool.h
-  ${OPENSPACE_BASE_DIR}/include/openspace/util/histogram.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/json.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/camera/camera.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/camera/camerapose.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/documentation/core_registration.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/documentation/documentation.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/documentation/documentationengine.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/documentation/documentationgenerator.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/documentation/verifier.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/documentation/verifier.inl
+  ${PROJECT_SOURCE_DIR}/include/openspace/engine/configuration.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/engine/downloadmanager.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/engine/globals.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/engine/globalscallbacks.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/engine/logfactory.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/engine/moduleengine.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/engine/moduleengine.inl
+  ${PROJECT_SOURCE_DIR}/include/openspace/engine/openspaceengine.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/engine/syncengine.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/engine/windowdelegate.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/events/event.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/events/eventengine.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/events/eventengine.inl
+  ${PROJECT_SOURCE_DIR}/include/openspace/interaction/action.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/interaction/actionmanager.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/interaction/delayedvariable.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/interaction/delayedvariable.inl
+  ${PROJECT_SOURCE_DIR}/include/openspace/interaction/camerainteractionstates.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/interaction/mouseinputstate.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/interaction/interactionmonitor.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/interaction/interpolator.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/interaction/interpolator.inl
+  ${PROJECT_SOURCE_DIR}/include/openspace/interaction/joystickinputstate.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/interaction/joystickcamerastates.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/interaction/keybindingmanager.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/interaction/keyboardinputstate.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/interaction/mousecamerastates.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/interaction/scriptcamerastates.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/interaction/sessionrecording.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/interaction/sessionrecording.inl
+  ${PROJECT_SOURCE_DIR}/include/openspace/interaction/websocketinputstate.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/interaction/websocketcamerastates.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/interaction/tasks/convertrecfileversiontask.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/interaction/tasks/convertrecformattask.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/mission/mission.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/mission/missionmanager.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/navigation/pathcurves/avoidcollisioncurve.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/navigation/pathcurves/zoomoutoverviewcurve.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/navigation/keyframenavigator.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/navigation/navigationhandler.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/navigation/navigationstate.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/navigation/orbitalnavigator.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/navigation/path.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/navigation/pathcurve.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/navigation/pathnavigator.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/navigation/waypoint.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/network/parallelconnection.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/network/parallelpeer.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/network/messagestructures.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/network/messagestructureshelper.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/properties/listproperty.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/properties/listproperty.inl
+  ${PROJECT_SOURCE_DIR}/include/openspace/properties/numericalproperty.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/properties/numericalproperty.inl
+  ${PROJECT_SOURCE_DIR}/include/openspace/properties/optionproperty.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/properties/property.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/properties/propertyowner.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/properties/selectionproperty.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/properties/stringproperty.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/properties/templateproperty.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/properties/templateproperty.inl
+  ${PROJECT_SOURCE_DIR}/include/openspace/properties/triggerproperty.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/properties/list/doublelistproperty.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/properties/list/intlistproperty.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/properties/list/stringlistproperty.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/properties/matrix/dmat2property.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/properties/matrix/dmat3property.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/properties/matrix/dmat4property.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/properties/matrix/mat2property.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/properties/matrix/mat3property.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/properties/matrix/mat4property.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/properties/scalar/boolproperty.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/properties/scalar/doubleproperty.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/properties/scalar/floatproperty.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/properties/scalar/intproperty.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/properties/scalar/longproperty.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/properties/scalar/shortproperty.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/properties/scalar/uintproperty.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/properties/scalar/ulongproperty.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/properties/scalar/ushortproperty.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/properties/vector/dvec2property.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/properties/vector/dvec3property.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/properties/vector/dvec4property.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/properties/vector/ivec2property.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/properties/vector/ivec3property.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/properties/vector/ivec4property.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/properties/vector/uvec2property.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/properties/vector/uvec3property.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/properties/vector/uvec4property.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/properties/vector/vec2property.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/properties/vector/vec3property.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/properties/vector/vec4property.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/query/query.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/rendering/dashboard.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/rendering/dashboarditem.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/rendering/dashboardtextitem.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/rendering/framebufferrenderer.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/rendering/deferredcaster.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/rendering/deferredcasterlistener.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/rendering/deferredcastermanager.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/rendering/loadingscreen.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/rendering/luaconsole.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/rendering/helper.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/rendering/raycasterlistener.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/rendering/raycastermanager.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/rendering/renderable.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/rendering/renderengine.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/rendering/screenspacerenderable.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/rendering/texturecomponent.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/rendering/transferfunction.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/rendering/volume.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/rendering/volumeraycaster.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/scene/asset.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/scene/assetmanager.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/scene/lightsource.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/scene/profile.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/scene/rotation.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/scene/scale.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/scene/scene.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/scene/sceneinitializer.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/scene/scenelicensewriter.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/scene/scenegraphnode.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/scene/timeframe.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/scene/translation.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/scripting/lualibrary.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/scripting/scriptengine.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/scripting/scriptscheduler.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/scripting/systemcapabilitiesbinding.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/util/blockplaneintersectiongeometry.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/util/boxgeometry.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/util/collisionhelper.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/util/concurrentjobmanager.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/util/concurrentjobmanager.inl
+  ${PROJECT_SOURCE_DIR}/include/openspace/util/concurrentqueue.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/util/concurrentqueue.inl
+  ${PROJECT_SOURCE_DIR}/include/openspace/util/coordinateconversion.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/util/distanceconstants.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/util/distanceconversion.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/util/factorymanager.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/util/factorymanager.inl
+  ${PROJECT_SOURCE_DIR}/include/openspace/util/httprequest.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/util/job.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/util/json_helper.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/util/json_helper.inl
+  ${PROJECT_SOURCE_DIR}/include/openspace/util/keys.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/util/memorymanager.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/util/mouse.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/util/openspacemodule.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/util/planegeometry.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/util/progressbar.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/util/resourcesynchronization.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/util/screenlog.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/util/sphere.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/util/spicemanager.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/util/syncable.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/util/syncbuffer.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/util/syncbuffer.inl
+  ${PROJECT_SOURCE_DIR}/include/openspace/util/syncdata.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/util/syncdata.inl
+  ${PROJECT_SOURCE_DIR}/include/openspace/util/task.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/util/taskloader.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/util/time.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/util/timeconversion.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/util/timeline.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/util/timeline.inl
+  ${PROJECT_SOURCE_DIR}/include/openspace/util/timemanager.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/util/timerange.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/util/touch.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/util/tstring.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/util/universalhelpers.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/util/updatestructures.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/util/versionchecker.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/util/transformationmanager.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/util/threadpool.h
+  ${PROJECT_SOURCE_DIR}/include/openspace/util/histogram.h
 )

 if (APPLE)
  set(OPENSPACE_HEADER
    ${OPENSPACE_HEADER}
-    ${OPENSPACE_BASE_DIR}/include/openspace/interaction/touchbar.h
+    ${PROJECT_SOURCE_DIR}/include/openspace/interaction/touchbar.h
  )
 endif ()

@@ -401,8 +401,8 @@ endif ()
 foreach (file ${OPENSPACE_SOURCE} ${OPENSPACE_HEADER})
  # Remove prefixes from the files
  set(original_file ${file})
-  string(REPLACE "${OPENSPACE_BASE_DIR}/src/" "" file ${file})
-  string(REPLACE "${OPENSPACE_BASE_DIR}/include/openspace/" "" file ${file})
+  string(REPLACE "${PROJECT_SOURCE_DIR}/src/" "" file ${file})
+  string(REPLACE "${PROJECT_SOURCE_DIR}/include/openspace/" "" file ${file})
  get_filename_component(directory ${file} DIRECTORY)
  if (NOT directory STREQUAL "")
    # Visual Studio wants '\' for the path separator
@@ -427,22 +427,22 @@ add_library(openspace-core STATIC ${OPENSPACE_HEADER} ${OPENSPACE_SOURCE})
 target_include_directories(openspace-core SYSTEM
  PUBLIC
    # In order to use the date library
-    ${OPENSPACE_BASE_DIR}/ext/date/include
+    ${PROJECT_SOURCE_DIR}/ext/date/include
    # In order to use the nlohmann JSON library
-    ${OPENSPACE_BASE_DIR}/ext
+    ${PROJECT_SOURCE_DIR}/ext
 )

 target_include_directories(openspace-core
  PUBLIC
    # In order to be able to include openspace-core files
-    ${OPENSPACE_BASE_DIR}/include
+    ${PROJECT_SOURCE_DIR}/include
    # In order to be able to include the module_registration file
    ${CMAKE_BINARY_DIR}/_generated/include

  PRIVATE
    # In order to be able to include module files.  This is a temporary fix as this
    # introduces a dependency from the opnspace-core onto the modules
-    ${OPENSPACE_BASE_DIR}
+    ${PROJECT_SOURCE_DIR}
 )

 target_precompile_headers(openspace-core PRIVATE
@@ -474,14 +474,14 @@ target_precompile_headers(openspace-core PRIVATE
 add_dependencies(openspace-core run_codegen)

 configure_file(
-  ${OPENSPACE_CMAKE_EXT_DIR}/openspace_header.template
+  ${PROJECT_SOURCE_DIR}/support/cmake/openspace_header.template
  ${CMAKE_BINARY_DIR}/_generated/include/openspace/openspace.h
  @ONLY IMMEDIATE
 )

 configure_file(
-  ${OPENSPACE_CMAKE_EXT_DIR}/commit.template
-  ${OPENSPACE_BASE_DIR}/COMMIT.md
+  ${PROJECT_SOURCE_DIR}/support/cmake/commit.template
+  ${PROJECT_SOURCE_DIR}/COMMIT.md
  @ONLY IMMEDIATE
 )

--- a/src/interaction/joystickcamerastates.cpp
+++ b/src/interaction/joystickcamerastates.cpp
@@ -73,7 +73,7 @@ void JoystickCameraStates::updateStateFromInput(

        int nAxes = joystickInputStates.numAxes(joystickInputState.name);
        for (int i = 0;
-             i < std::min(static_cast<size_t>(nAxes), joystick->axisMapping.size());
+             i < std::min(nAxes, static_cast<int>(joystick->axisMapping.size()));
             ++i)
        {
            AxisInformation t = joystick->axisMapping[i];
--- a/src/interaction/mousecamerastates.cpp
+++ b/src/interaction/mousecamerastates.cpp
@@ -52,11 +52,11 @@ void MouseCameraStates::updateStateFromInput(const MouseInputState& mouseinputSt
    bool primaryPressed = mouseinputState.isMouseButtonPressed(primary);
    bool secondaryPressed = mouseinputState.isMouseButtonPressed(secondary);
    bool button3Pressed = mouseinputState.isMouseButtonPressed(MouseButton::Button3);
-    bool keyCtrlPressed = keyboardinputState.isKeyPressed(Key::LeftControl) |
+    bool keyCtrlPressed = keyboardinputState.isKeyPressed(Key::LeftControl) ||
                          keyboardinputState.isKeyPressed(Key::RightControl);
-    bool keyShiftPressed = keyboardinputState.isKeyPressed(Key::LeftShift) |
+    bool keyShiftPressed = keyboardinputState.isKeyPressed(Key::LeftShift) ||
                           keyboardinputState.isKeyPressed(Key::RightShift);
-    bool keyAltPressed = keyboardinputState.isKeyPressed(Key::LeftAlt) |
+    bool keyAltPressed = keyboardinputState.isKeyPressed(Key::LeftAlt) ||
                         keyboardinputState.isKeyPressed(Key::RightAlt);

    // Update the mouse states
--- a/src/properties/property.cpp
+++ b/src/properties/property.cpp
@@ -40,8 +40,6 @@ namespace {
    constexpr std::string_view IdentifierKey = "Identifier";
    constexpr std::string_view NameKey = "Name";
    constexpr std::string_view TypeKey = "Type";
-    constexpr std::string_view DescriptionKey = "Description";
-    constexpr std::string_view JsonValueKey = "Value";
    constexpr std::string_view MetaDataKey = "MetaData";
    constexpr std::string_view AdditionalDataKey = "AdditionalData";
 } // namespace
--- a/src/scene/scene.cpp
+++ b/src/scene/scene.cpp
@@ -466,7 +466,7 @@ void Scene::addPropertyInterpolation(properties::Property* prop, float durationS
        if (info.prop == prop) {
            info.beginTime = now;
            info.durationSeconds = durationSeconds;
-            info.postScript = std::move(postScript),
+            info.postScript = std::move(postScript);
            info.easingFunction = func;
            // If we found it, we can break since we make sure that each property is only
            // represented once in this
--- a/src/util/coordinateconversion.cpp
+++ b/src/util/coordinateconversion.cpp
@@ -301,7 +301,7 @@ std::pair<std::string, std::string> decimalDegreesToIcrs(double ra, double dec)

    // Calculate Dec
    int decDegrees = static_cast<int>(std::trunc(decDeg));
-    double decMinutesFull = (abs(decDeg) - abs(decDegrees)) * 60.0;
+    double decMinutesFull = (std::abs(decDeg) - std::abs(decDegrees)) * 60.0;
    int decMinutes = static_cast<int>(std::trunc(decMinutesFull));
    double decSeconds = (decMinutesFull - decMinutes) * 60.0;

--- a/support/cmake/application_definition.cmake
+++ b/support/cmake/application_definition.cmake
@@ -22,14 +22,37 @@
 # OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                          #
 ##########################################################################################

-include(${OPENSPACE_CMAKE_EXT_DIR}/global_variables.cmake)
+include(${PROJECT_SOURCE_DIR}/support/cmake/global_variables.cmake)
+
+function (copy_files target)
+  # Add the copy command
+  foreach (file_i ${ARGN})
+    if (IS_DIRECTORY "${file_i}")
+      # copy_if_different doesn't handle directories well and just copies them without
+      # contents.  So if the path is a directory, we need to issue a different copy
+      # command
+      get_filename_component(folder ${file_i} NAME)
+      add_custom_command(
+        TARGET ${target}
+        POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy_directory "${file_i}" "$<TARGET_FILE_DIR:${target}>/${folder}"
+      )
+    else ()
+      add_custom_command(
+        TARGET ${target}
+        POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different "${file_i}" $<TARGET_FILE_DIR:${target}>
+      )
+    endif ()
+  endforeach ()
+endfunction ()

 function (create_new_application application_name)
  add_executable(${application_name} MACOSX_BUNDLE ${ARGN})
  set_openspace_compile_settings(${application_name})
  if (WIN32)
    get_external_library_dependencies(ext_lib)
-    ghl_copy_files(${application_name} ${ext_lib})
+    copy_files(${application_name} ${ext_lib})
  endif ()

  target_link_libraries(${application_name} PUBLIC openspace-module-base)
--- a/support/cmake/module_common.cmake
+++ b/support/cmake/module_common.cmake
@@ -39,7 +39,7 @@ endfunction ()

 function (create_module_header_filepath module_name module_path header_filepath)
  string(TOLOWER ${module_name} module_name)
-  string(REPLACE "${OPENSPACE_BASE_DIR}/" "" module_path ${module_path})
+  string(REPLACE "${PROJECT_SOURCE_DIR}/" "" module_path ${module_path})
  set(header_filepath "${module_path}/${module_name}module.h" PARENT_SCOPE)
 endfunction ()

--- a/support/cmake/module_definition.cmake
+++ b/support/cmake/module_definition.cmake
@@ -22,9 +22,8 @@
 # OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                          #
 ##########################################################################################

-include(${OPENSPACE_CMAKE_EXT_DIR}/module_common.cmake)
-include(${OPENSPACE_CMAKE_EXT_DIR}/set_openspace_compile_settings.cmake)
-include(${GHOUL_BASE_DIR}/support/cmake/handle_external_library.cmake)
+include(${PROJECT_SOURCE_DIR}/support/cmake/module_common.cmake)
+include(${PROJECT_SOURCE_DIR}/support/cmake/set_openspace_compile_settings.cmake)

 include(GenerateExportHeader)

@@ -33,7 +32,7 @@ include(GenerateExportHeader)
 # The library will have the name openspace-module-<name> and has all of their
 # dependencies set correctly.
 # The 'library_mode' determines whether the module is linked STATIC or SHARED
-# Dependencies will have to be set in a file called "include.cmake" 
+# Dependencies will have to be set in a file called "include.cmake"
 function (create_new_module module_name output_library_name library_mode)
  # Create a library name of the style: openspace-module-${name}
  create_library_name(${module_name} library_name)
@@ -47,7 +46,7 @@ function (create_new_module module_name output_library_name library_mode)
  # Set compile settings that are common to all modules
  set_openspace_compile_settings(${library_name})

-  target_include_directories(${library_name} PUBLIC ${OPENSPACE_BASE_DIR})
+  target_include_directories(${library_name} PUBLIC ${PROJECT_SOURCE_DIR})
  create_define_name(${module_name} define_name)
  target_compile_definitions(${library_name} PUBLIC "${define_name}")

@@ -68,7 +67,7 @@ function (create_new_module module_name output_library_name library_mode)
  # instead
  # This value is used in handle_modules.cmake::handle_modules
  set_property(GLOBAL PROPERTY CurrentModuleClassName "${module_name}Module")
-  
+
  set(${output_library_name} ${library_name} PARENT_SCOPE)
 endfunction ()

--- a/support/cmake/packaging.cmake
+++ b/support/cmake/packaging.cmake
@@ -27,8 +27,8 @@ set(CPACK_MONOLITHIC_INSTALL TRUE)
 include(InstallRequiredSystemLibraries)

 set(CPACK_PACKAGE_NAME "OpenSpace")
-set(CPACK_PACKAGE_DESCRIPTION_FILE "${OPENSPACE_BASE_DIR}/README.md")
-set(CPACK_RESOURCE_FILE_LICENSE "${OPENSPACE_BASE_DIR}/LICENSE.md")
+set(CPACK_PACKAGE_DESCRIPTION_FILE "${PROJECT_SOURCE_DIR}/README.md")
+set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE.md")
 set(CPACK_PACKAGE_VERSION_MAJOR "${OPENSPACE_VERSION_MAJOR}")
 set(CPACK_PACKAGE_VERSION_MINOR "${OPENSPACE_VERSION_MINOR}")
 set(CPACK_PACKAGE_VERSION_PATCH "${OPENSPACE_VERSION_PATCH}")
@@ -42,15 +42,15 @@ set(CPACK_PACKAGE_FILE_NAME
 set(CPACK_STRIP_FILES 1)

 install(DIRECTORY
-  ${OPENSPACE_BASE_DIR}/bin/${CMAKE_BUILD_TYPE}/
+  ${PROJECT_SOURCE_DIR}/bin/${CMAKE_BUILD_TYPE}/
  DESTINATION bin
  USE_SOURCE_PERMISSIONS
 )
-install(DIRECTORY ${OPENSPACE_BASE_DIR}/config/ DESTINATION config)
+install(DIRECTORY ${PROJECT_SOURCE_DIR}/config/ DESTINATION config)

-install(DIRECTORY ${OPENSPACE_BASE_DIR}/data/ DESTINATION data)
+install(DIRECTORY ${PROJECT_SOURCE_DIR}/data/ DESTINATION data)

-install(DIRECTORY ${OPENSPACE_BASE_DIR}/modules/
+install(DIRECTORY ${PROJECT_SOURCE_DIR}/modules/
  DESTINATION modules
  FILES_MATCHING
  PATTERN "*.glsl"
@@ -59,25 +59,25 @@ install(DIRECTORY ${OPENSPACE_BASE_DIR}/modules/
  PATTERN "*.vs"
  PATTERN "*.lua"
 )
-install(DIRECTORY ${OPENSPACE_BASE_DIR}/scripts/ DESTINATION scripts)
-install(DIRECTORY ${OPENSPACE_BASE_DIR}/shaders/ DESTINATION shaders)
+install(DIRECTORY ${PROJECT_SOURCE_DIR}/scripts/ DESTINATION scripts)
+install(DIRECTORY ${PROJECT_SOURCE_DIR}/shaders/ DESTINATION shaders)

 install(FILES
-  ${OPENSPACE_BASE_DIR}/openspace.cfg
-  ${OPENSPACE_BASE_DIR}/CREDITS.md
-  ${OPENSPACE_BASE_DIR}/LICENSE.md
-  ${OPENSPACE_BASE_DIR}/README.md
+  ${PROJECT_SOURCE_DIR}/openspace.cfg
+  ${PROJECT_SOURCE_DIR}/CREDITS.md
+  ${PROJECT_SOURCE_DIR}/LICENSE.md
+  ${PROJECT_SOURCE_DIR}/README.md
  DESTINATION .
 )

 if (WIN32)
  set(CPACK_GENERATOR ZIP)
  # Need backslash for correct subdirectory paths
-  set(CPACK_PACKAGE_ICON "${OPENSPACE_BASE_DIR}\\\\apps\\\\OpenSpace\\\\openspace.png")
+  set(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}\\\\apps\\\\OpenSpace\\\\openspace.png")
  set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_NAME}\\\\${OPENSPACE_VERSION_NUMBER} ${OPENSPACE_VERSION_STRING}")
 else ()
  set(CPACK_GENERATOR TGZ)
-  set(CPACK_PACKAGE_ICON "${OPENSPACE_BASE_DIR}/apps/OpenSpace/openspace.png")
+  set(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/apps/OpenSpace/openspace.png")
  set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_NAME}/${OPENSPACE_VERSION_NUMBER} ${OPENSPACE_VERSION_STRING}")
 endif ()

@@ -97,7 +97,7 @@ if (OPENSPACE_CREATE_INSTALLER)
    # Delete the desktop link
    set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "Delete '$DESKTOP\\\\${CPACK_NSIS_DISPLAY_NAME}.lnk' ")
    # The icon to start the application.
-    set(CPACK_NSIS_MUI_ICON "${OPENSPACE_BASE_DIR}\\\\apps\\\\OpenSpace\\\\openspace.ico")
+    set(CPACK_NSIS_MUI_ICON "${PROJECT_SOURCE_DIR}\\\\apps\\\\OpenSpace\\\\openspace.ico")
    # Add a link to the application website in the startup menu.
    set(CPACK_NSIS_MENU_LINKS "http://openspaceproject.com/" "OpenSpace Homepage")
    # Set the icon for the application in the Add/Remove programs section.
--- a/support/cmake/set_openspace_compile_settings.cmake
+++ b/support/cmake/set_openspace_compile_settings.cmake
@@ -31,13 +31,9 @@ function (set_openspace_compile_settings target)
    "/wd4127"   # conditional expression is constant [raised by: websocketpp]
    "/wd4201"   # nonstandard extension used : nameless struct/union  [raised by: GLM]
    "/wd5030"   # attribute 'attribute' is not recognized  [raised by: codegen]
-    "/std:c++latest"
    "/permissive-"
    "/Zc:__cplusplus" # Correctly set the __cplusplus macro
  )
-  if (OPENSPACE_WARNINGS_AS_ERRORS)
-    set(MSVC_WARNINGS ${MSVC_WARNINGS} "/WX")
-  endif ()
  if (OPENSPACE_OPTIMIZATION_ENABLE_AVX)
    set(MSVC_WARNINGS ${MSVC_WARNINGS} "/arch:AVX")
  endif ()
@@ -61,12 +57,11 @@ function (set_openspace_compile_settings target)
  endif ()

  set(CLANG_WARNINGS
-    "-stdlib=libc++"
    "-Wall"
    "-Wextra"
    "-Wmost"
    "-Wpedantic"
-    
+
    "-Wabstract-vbase-init"
    "-Walloca"
    "-Wanon-enum-enum-conversion"
@@ -141,14 +136,11 @@ function (set_openspace_compile_settings target)
    "-Wvariadic-macros"
    "-Wvla"
    "-Wzero-as-null-pointer-constant"
-    
+
    "-Wno-attributes"
    "-Wno-missing-braces"
    "-Wno-unknown-attributes"
  )
-  if (OPENSPACE_WARNINGS_AS_ERRORS)
-    set(CLANG_WARNINGS ${CLANG_WARNINGS} "-Werror")
-  endif ()


  set(GCC_WARNINGS
@@ -177,17 +169,15 @@ function (set_openspace_compile_settings target)
    "-Wuninitialized"
    "-Wvla"
    "-Wzero-as-null-pointer-constant"
-    
+
    "-Wno-attributes"
    "-Wno-deprecated-copy"
    "-Wno-float-equal"
    "-Wno-long-long"
+    "-Wno-missing-field-initializers"
    "-Wno-unknown-attributes"
    "-Wno-write-strings"
  )
-  if (OPENSPACE_WARNINGS_AS_ERRORS)
-    set(GCC_WARNINGS ${CLANG_WARNINGS} "-Werror")
-  endif ()

  if (MSVC)
    target_compile_options(${target} PRIVATE ${MSVC_WARNINGS})
@@ -198,16 +188,12 @@ function (set_openspace_compile_settings target)
    target_compile_definitions(${target} PRIVATE "WIN32_LEAN_AND_MEAN")
    target_compile_definitions(${target} PRIVATE "VC_EXTRALEAN")
  elseif (NOT LINUX AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    if (OPENSPACE_WARNINGS_AS_ERRORS)
-      target_compile_options(${target} PRIVATE "-Werror")
-    endif ()
-    # Apple has "deprecated" OpenGL and offers nothing by warnings instead
+    # Apple has "deprecated" OpenGL and offers nothing but warnings instead
    target_compile_definitions(${target} PRIVATE "GL_SILENCE_DEPRECATION")

    target_compile_options(${target} PRIVATE ${CLANG_WARNINGS})
  elseif (UNIX AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    target_compile_options(${target} PRIVATE ${CLANG_WARNINGS} "-std=c++17")
-    target_link_libraries(${target} PRIVATE "c++" "c++abi")
+    target_compile_options(${target} PRIVATE ${CLANG_WARNINGS})
  elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
    target_compile_options(${target} PRIVATE ${GCC_WARNINGS})
  else ()
--- a/support/coding/codegen
+++ b/support/coding/codegen
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -73,4 +73,4 @@ if (OPENSPACE_MODULE_WEBBROWSER AND CEF_ROOT)
  run_cef_platform_config("${CEF_ROOT}" "${CEF_TARGET}" "${WEBBROWSER_MODULE_PATH}")
 endif ()

-set_folder_location(OpenSpaceTest "Unit Tests")
+set_target_properties(OpenSpaceTest PROPERTIES FOLDER "Unit Tests")
--- a/tests/test_spicemanager.cpp
+++ b/tests/test_spicemanager.cpp
@@ -239,7 +239,7 @@ TEST_CASE("SpiceManager: Get Value From ID 1D", "[spicemanager]") {
    std::string target  = "EARTH";
    std::string value1D = "MAG_NORTH_POLE_LAT";

-    double return1D;
+    double return1D = 0.0;
    CHECK_NOTHROW(openspace::SpiceManager::ref().getValue(target, value1D, return1D));
    CHECK(return1D == 78.565);

@@ -291,8 +291,8 @@ TEST_CASE("SpiceManager: String To Ephemeris Time", "[spicemanager]") {

    loadLSKKernel();

-    double ephemerisTime;
-    double control_ephemerisTime;
+    double ephemerisTime = -1.0;
+    double control_ephemerisTime = 0.0;
    char date[SRCLEN] = "Thu Mar 20 12:53:29 PST 1997";
    str2et_c(date, &control_ephemerisTime);