Build system simplification and rework

.gitignore

@@ -1,5 +1,7 @@
 __pycache__
 bin/
+install/
+lib/
 build/
 .idea/
 .idea/workspace.xml
@@ -11,8 +13,21 @@ cmake-build-debug/*
 core/Debug/
 .vscode/
 vs/
-lib/
+cache/
+system_modules/napof/Debug/
+system_modules/napof/Release/
+system_modules/napgui/Debug/
+system_modules/napgui/Release/napgui.tlog/Lib-link.read.1.tlog
+system_modules/napgui/Release/
+system_modules/napetherservice/Release/
+system_modules/napinput/Debug/
+system_modules/napetherservice/Debug/
+core/Release/
+system_modules/napinput/Release/
+test/unittest/Release/unittest.vcxprojResolveAssemblyReference.cache
 *.user
+system_modules/napawesomium/Release/napawesomium.vcxprojResolveAssemblyReference.cache
+system_modules/network/Release/
 modules/
 napkin/Release/
 /msvc32
@@ -85,6 +100,7 @@ thirdparty/rapidjson/thirdparty/
 *.o
 thirdparty/rttr/macos/*
 !thirdparty/rttr/macos/x86_64
+!thirdparty/rttr/macos/universal
 thirdparty/rttr/msvc/*
 !thirdparty/rttr/msvc/x86_64
 thirdparty/rttr/linux/*
@@ -112,4 +128,24 @@ pyvenv.cfg
 system_modules/naprender/thirdparty/vulkansdk/linux/lib/libVkLayer_khronos_validation.so
 system_modules/naprender/thirdparty/vulkansdk/linux/lib/libVkLayer_api_dump.so
 system_modules/naplicense/thirdparty/cryptopp/linux/*/lib/libcryptopp.a
+!system_modules/napportaudio/thirdparty/portaudio/macos/universal/lib/
+!system_modules/napaudio/thirdparty/libsndfile/macos/universal/lib/
+!system_modules/napaudio/thirdparty/mpg123/macos/universal/lib/
+!system_modules/naposc/thirdparty/oscpack/macos/universal/lib/
+!system_modules/napmidi/thirdparty/rtmidi/macos/universal/lib/
+!thirdparty/rttr/macos/universal/bin/
+!thirdparty/python/macos/universal/bin/
+!thirdparty/python/macos/universal/lib/
+!thirdparty/cmake/macos/universal/bin/
+!thirdparty/cmake/macos/universal/share/*/*
+!system_modules/napportaudio/thirdparty/portaudio/macos/x86_64/lib/
+!system_modules/napaudio/thirdparty/libsndfile/macos/x86_64/lib/
+!system_modules/napaudio/thirdparty/mpg123/macos/x86_64/lib/
+!system_modules/naposc/thirdparty/oscpack/macos/x86_64/lib/
+!system_modules/napmidi/thirdparty/rtmidi/macos/x86_64/lib/
+!thirdparty/rttr/macos/x86_64/bin/
+!thirdparty/python/macos/x86_64/bin/
+!thirdparty/python/macos/x86_64/lib/
+!thirdparty/cmake/macos/x86_64/bin/
+!thirdparty/cmake/macos/x86_64/share/*/*
 thirdparty/docker_images/cmake

CMakeLists.txt

@@ -1,142 +1,48 @@
-cmake_minimum_required(VERSION 3.18.4)
+cmake_minimum_required(VERSION 3.19)
+set(CMAKE_OSX_ARCHITECTURES arm64;x86_64)
 project(NAP)
 
-# Keep the current directory as project root
 set(NAP_ROOT ${CMAKE_CURRENT_LIST_DIR})
-message(STATUS "Using NAP Root: ${CMAKE_CURRENT_LIST_DIR}")
+include(${NAP_ROOT}/cmake/setup.cmake)
+include(${NAP_ROOT}/cmake/nap_utilities.cmake)
 
-# Inform system we're building from source
-set(NAP_BUILD_CONTEXT "source")
+setup()
 
-# Thirdparty libraries reside in this location, keep an absolute path
-set(THIRDPARTY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty)
-message(STATUS "Using thirdparty directory: ${THIRDPARTY_DIR}")
-
-# Include utilities
-include(cmake/macros_and_functions.cmake)
-include(cmake/framework_release_packaging.cmake)
-include(cmake/qtconfig.cmake)
-
-# Initialize environment
-bootstrap_environment()
-set_source_build_configuration()
-set(MODULE_INTO_PARENT TRUE)
-set(CMAKE_INSTALL_PREFIX ${CMAKE_SOURCE_DIR}/packaging_staging)
-
-# store project directory
-get_filename_component(PROJECTS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/.. ABSOLUTE)
-
-# library targets
-add_subdirectory(core)
 add_subdirectory(utility)
 add_subdirectory(rtti)
-add_subdirectory(qt)
-
-# tools targets
-add_subdirectory(tools/fbxconverter)
-add_subdirectory(tools/napkin)
-add_subdirectory(tools/keygen)
-add_subdirectory(tools/licensegenerator)
-
-# START_SOURCE_ARCHIVE_REMOVED_SECTION (don't remove)
-# app targets, add your own app targets here!
-add_subdirectory(apps/example)
-# END_SOURCE_ARCHIVE_REMOVED_SECTION (don't remove)
-
-# demo targets
-add_subdirectory(demos/helloworld)
-add_subdirectory(demos/rotatingtexcube)
-add_subdirectory(demos/vinyl)
-add_subdirectory(demos/multiwindow)
-if(RPI_MODEL)
-    message(STATUS "Skipping target: heightmap, not supported on Raspberry Pi")
-else()
-    add_subdirectory(demos/heightmap)
-endif()
-add_subdirectory(demos/dynamicgeo)
-add_subdirectory(demos/computeparticles)
-if(RPI_MODEL)
-    message(STATUS "Skipping target: computeflocking, not supported on Raspberry Pi")
-else()
-    add_subdirectory(demos/computeflocking)
-endif()
-add_subdirectory(demos/videomodulation)
-add_subdirectory(demos/blobtrace)
-add_subdirectory(demos/audioanalysis)
-add_subdirectory(demos/audioplayback)
-add_subdirectory(demos/oscmidi)
-add_subdirectory(demos/curveball)
-add_subdirectory(demos/copystamp)
-add_subdirectory(demos/websocketserver)
-add_subdirectory(demos/sequencer)
-add_subdirectory(demos/paintobject)
-add_subdirectory(demos/licensecheck)
-add_subdirectory(demos/artnetsend)
-add_subdirectory(demos/artnetreceive)
-add_subdirectory(demos/webportal)
-add_subdirectory(demos/python)
-add_subdirectory(demos/lightsandshadow)
-add_subdirectory(demos/skybox)
-add_subdirectory(demos/udpsend)
-add_subdirectory(demos/udpreceive)
-add_subdirectory(demos/linemorphing)
-add_subdirectory(demos/spotlight)
-
-if(APPLE)
-    set(GENERATE_XCODE_PROJECT_TARGET generateXcodeProject)
-    add_custom_target(generateXcodeProject ${CMAKE_COMMAND} -H. -B. -G Xcode -DCMAKE_BUILD_TYPE=Debug ../)
-endif()
-#add_dependencies(${PROJECT_NAME} ${GENERATE_XCODE_PROJECT_TARGET})
-
-# Modules
+add_subdirectory(core)
+add_subdirectory(system_modules/napmath)
+add_subdirectory(system_modules/napscene)
+add_subdirectory(system_modules/napfont)
 add_subdirectory(system_modules/napinput)
+add_subdirectory(system_modules/napcolor)
 add_subdirectory(system_modules/naprender)
-add_subdirectory(system_modules/napmath)
 add_subdirectory(system_modules/napsdlinput)
-add_subdirectory(system_modules/napscene)
-add_subdirectory(system_modules/napcameracontrol)
-add_subdirectory(system_modules/nappython)
-add_subdirectory(system_modules/napvideo)
-add_subdirectory(system_modules/napaudio)
-add_subdirectory(system_modules/napportaudio)
-add_subdirectory(system_modules/napartnet)
-add_subdirectory(system_modules/naposc)
-add_subdirectory(system_modules/napsvg)
 add_subdirectory(system_modules/napapp)
 add_subdirectory(system_modules/napimgui)
-add_subdirectory(system_modules/napmidi)
-add_subdirectory(system_modules/napfont)
-add_subdirectory(system_modules/napapi)
 add_subdirectory(system_modules/napparameter)
 add_subdirectory(system_modules/napparametergui)
-add_subdirectory(system_modules/napserial)
-add_subdirectory(system_modules/napwebsocket)
-add_subdirectory(system_modules/napapiwebsocket)
-add_subdirectory(system_modules/napcolor)
-add_subdirectory(system_modules/napsequence)
-add_subdirectory(system_modules/napsequencegui)
-add_subdirectory(system_modules/napsequenceaudio)
-add_subdirectory(system_modules/napsequenceaudiogui)
-add_subdirectory(system_modules/naplicense)
+add_subdirectory(system_modules/napcameracontrol)
+add_subdirectory(system_modules/napaudio)
+add_subdirectory(system_modules/napportaudio)
+add_subdirectory(system_modules/napmidi)
+add_subdirectory(system_modules/naposc)
 add_subdirectory(system_modules/napudp)
-add_subdirectory(system_modules/napcalendar)
 add_subdirectory(system_modules/napasio)
-add_subdirectory(system_modules/napportal)
-add_subdirectory(system_modules/napopenssl)
-add_subdirectory(system_modules/naprenderadvanced)
+add_subdirectory(system_modules/napapi)
 
-solution_info_to_cmake()
+set(NAP_BUILD_CONTEXT source) # This is here just to guarantee backwards compatibility with 0.6 style NAP modules
+add_subdirectory_modules(modules)
+add_subdirectory_apps(apps)
 
-# Add additional directories if specified from command line.
-# For example: -DADDITIONAL_SUB_DIRECTORIES="apps/myapp;apps/myapp/module"
-if(ADDITIONAL_SUB_DIRECTORIES)
-    foreach(SUB_DIR ${ADDITIONAL_SUB_DIRECTORIES})
-        message(STATUS "Adding sub directory: ${SUB_DIR}")
-        add_subdirectory(${SUB_DIR})
-    endforeach()
-endif()
+add_subdirectory(demos/helloworld)
+add_subdirectory(demos/audioplayback)
+add_subdirectory(demos/audioanalysis)
+add_subdirectory(demos/oscmidi)
+add_subdirectory(demos/udpsend)
+add_subdirectory(demos/udpreceive)
 
+add_subdirectory(tools/fbxconverter)
+add_subdirectory(qt)
+add_subdirectory(tools/napkin)
 
-# Packaging
-include(cmake/framework_release_packaging.cmake)
-package_nap()

apps/example/CMakeLists.txt

@@ -1,9 +1 @@
-# DO NOT EDIT THIS FILE
-# It is automatically generated and will be overwritten
-# Extra app CMake logic belongs in app_extra.cmake
-cmake_minimum_required(VERSION 3.18.4)
-set(NAP_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../..)
-include(${NAP_ROOT}/cmake/macros_and_functions.cmake)
-get_filename_component(app_name_from_dir ${CMAKE_CURRENT_SOURCE_DIR} NAME)
-project(${app_name_from_dir})
 include(${NAP_ROOT}/cmake/nap_app.cmake)

apps/example/module/CMakeLists.txt

@@ -1,23 +1 @@
-# DO NOT EDIT THIS FILE
-# It is automatically generated and will be overwritten
-# Extra module CMake logic belongs in module_extra.cmake
-cmake_minimum_required(VERSION 3.18.4)
-
-if(NOT DEFINED NAP_ROOT)
-    cmake_path(GET CMAKE_CURRENT_SOURCE_DIR STEM LAST_ONLY dir_name)
-    if(dir_name MATCHES "^module$")
-        set(path_from_module_to_root ../../..)
-    else()
-        set(path_from_module_to_root ../..)
-    endif()
-    set(NAP_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/${path_from_module_to_root})
-endif()
-include(${NAP_ROOT}/cmake/macros_and_functions.cmake)
-
-directory_name_to_module_name()
-if(TARGET ${MODULE_NAME})
-    return()
-endif()
-
-project(${MODULE_NAME})
-include(${NAP_ROOT}/cmake/nap_module.cmake)
+include(${NAP_ROOT}/cmake/nap_module.cmake)

apps/example/module/module.json

@@ -4,7 +4,6 @@
     "RequiredModules": [
         "naprender",
         "napaudio",
-        "napvideo",
         "napscene",
         "napcameracontrol",
         "napparameter"

cmake/Info.plist.in

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleGetInfoString</key>
+	<string>${APP_TITLE}</string>
+	<key>CFBundleExecutable</key>
+	<string>${PROJECT_NAME}</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.${PROJECT_NAME}.napframework.www</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>NSMicrophoneUsageDescription</key>
+	<string>${PROJECT_NAME} microphone use</string>
+	<key>NSHighResolutionCapable</key>
+	<string>True</string>
+</dict>
+</plist>