The Great Rewrite

.gitignore

@@ -1,3 +1,4 @@
 .idea
 cmake-build-*
 build
+src/sandbox.cpp

CMakeLists.txt

@@ -25,73 +25,96 @@
 # target that uses tweeny, a simple `target_link_libraries(target tweeny)` is sufficient to set up include and link
 # instructions.
 
-cmake_minimum_required(VERSION 3.0...3.28)
+cmake_minimum_required(VERSION 3.23...3.28)
 cmake_policy(SET CMP0063 NEW)
-project(Tweeny LANGUAGES CXX VERSION 3.2.0)
+project(Tweeny LANGUAGES CXX VERSION 4.0.0)
+
+# Enforce C++17 for targets built in this project
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
 
 # Setup variables and options
 option(TWEENY_BUILD_DOCUMENTATION "Attempts to build the documentation. You'll need doxygen and graphviz installed" OFF)
 option(TWEENY_BUILD_SINGLE_HEADER "Joins together all header files in a single one. Needs Python 3.6 and quom installed" OFF)
 option(TWEENY_BUILD_SANDBOX "Adds a 'sandbox' target that links to tweeny. Useful when exploring tweeny" OFF)
+option(TWEENY_BUILD_TESTS "Build Tweeny tests (requires Catch2 v3 to be findable via CMake)" OFF)
 
 # The library target
 add_library(tweeny INTERFACE)
 
-# Specify the C++ features a compiler should have to use this library.
-if(NOT CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
-    target_compile_features(tweeny
-        INTERFACE
-        cxx_auto_type
-        cxx_variadic_templates
-        cxx_lambdas
-        cxx_nullptr
-        cxx_right_angle_brackets
-        cxx_static_assert
-        cxx_template_template_parameters
-    )
-else()
-    list(APPEND CMAKE_CXX_FLAGS -std=c++11)
-endif()
+# Require C++17 for consumers of this interface library.
+target_compile_features(tweeny INTERFACE cxx_std_17)
+
+# Provide namespaced alias for consumers.
+add_library(tweeny::tweeny ALIAS tweeny)
 
 # Set up include directories
 target_include_directories(tweeny INTERFACE
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:include/tweeny>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+  $<INSTALL_INTERFACE:include/tweeny>
+)
+
+# Attach headers to the interface target for IDEs and installation
+target_sources(tweeny INTERFACE
+  FILE_SET HEADERS
+  BASE_DIRS
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/tweeny
+  FILES
+    include/tweeny/event.h
+    include/tweeny/tweeny.h
+    include/tweeny/tween.h
+    include/tweeny/tween.tcc
+    include/tweeny/easing.h
+    include/tweeny/detail/interpolate.h
+    include/tweeny/detail/key-frame.h
+    include/tweeny/detail/tuple-utilities.h
+    include/tweeny/detail/tween-value.h
+    include/tweeny/detail/value-container.h
+    include/tweeny/detail/easing/back.h
+    include/tweeny/detail/easing/bounce.h
+    include/tweeny/detail/easing/circular.h
+    include/tweeny/detail/easing/cubic.h
+    include/tweeny/detail/easing/def.h
+    include/tweeny/detail/easing/elastic.h
+    include/tweeny/detail/easing/exponential.h
+    include/tweeny/detail/easing/linear.h
+    include/tweeny/detail/easing/quadratic.h
+    include/tweeny/detail/easing/quartic.h
+    include/tweeny/detail/easing/quintic.h
+    include/tweeny/detail/easing/sinusoidal.h
+    include/tweeny/detail/easing/stepped.h
 )
 
 # Set up install
 include(GNUInstallDirs)
-install(TARGETS tweeny EXPORT TweenyTargets)
-install(DIRECTORY include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/tweeny)
+install(TARGETS tweeny EXPORT TweenyTargets FILE_SET HEADERS)
 
 # Set up export and config
 include(cmake/SetupExports.cmake)
 
 if (TWEENY_BUILD_DOCUMENTATION)
-    add_subdirectory(doc)
-endif()
-
-# This library is a convenience library to force files appear in the IDE properly.
-add_library(tweeny-dummy
-        include/tweeny.h
-        include/tweeny.tcc
-        include/tween.h
-        include/tween.tcc
-        include/tweenone.tcc
-        include/tweenpoint.h
-        include/tweenpoint.tcc
-        include/tweentraits.h
-        include/easing.h
-        include/easingresolve.h
-        include/int2type.h
-        include/dispatcher.h)
-set_target_properties(tweeny-dummy PROPERTIES LINKER_LANGUAGE CXX EXCLUDE_FROM_ALL TRUE)
+  add_subdirectory(src/doc)
+endif ()
+
+if (TWEENY_BUILD_TESTS)
+  enable_testing()
+  add_subdirectory(src/tests)
+endif ()
 
 if (TWEENY_BUILD_SINGLE_HEADER)
-    include(cmake/GenerateSingleHeader.cmake)
-endif()
+  include(cmake/GenerateSingleHeader.cmake)
+endif ()
+
+# Check for sandbox file existence and build if found
+if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/src/sandbox.cpp")
+  add_executable(sandbox src/sandbox.cpp)
+  target_link_libraries(sandbox tweeny)
 
-if (TWEENY_BUILD_SANDBOX)
-    add_executable(sandbox src/sandbox.cc)
-    target_link_libraries(sandbox tweeny)
-endif()
+  # Enable very strict warnings and treat warnings as errors for the sandbox target
+  target_compile_options(sandbox PRIVATE
+    $<$<CXX_COMPILER_ID:GNU,Clang>:-Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion -Wshadow -Wold-style-cast -Wcast-align -Woverloaded-virtual -Wnull-dereference -Wdouble-promotion -Wformat=2 -Wimplicit-fallthrough -Wswitch-enum -Wzero-as-null-pointer-constant -Wuseless-cast -Werror>
+    $<$<CXX_COMPILER_ID:AppleClang>:-Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion -Wshadow -Wold-style-cast -Wcast-align -Woverloaded-virtual -Wnull-dereference -Wformat=2 -Wimplicit-fallthrough -Wswitch-enum -Wzero-as-null-pointer-constant -Wuseless-cast -Werror>
+    $<$<CXX_COMPILER_ID:MSVC>:/W4 /WX /permissive->
+  )
+endif ()

cmake/GenerateSingleHeader.cmake

@@ -1,14 +1,14 @@
 # This cmake script is used to generate a single header file with all of tweeny
-find_package(Python 3.6 QUIET)
+find_package(Python3 3.6 COMPONENTS Interpreter QUIET)
 
-if (NOT PYTHON_FOUND)
-  message(STATUS "Python 3.6 not found. Single-header include file will NOT be created")
+if (NOT Python3_Interpreter_FOUND)
+  message(STATUS "Python 3.6+ interpreter not found. Single-header include file will NOT be created")
   return()
 endif()
 
 find_program(QUOM_EXECUTABLE NAMES quom)
-if (QUOM_EXECUTABLE-NOTFOUND)
-  message(STATUS "quom program not found. Install it with pip or easy_install")
+if (NOT QUOM_EXECUTABLE)
+  message(STATUS "quom program not found. Install it with: pip3 install quom")
   return()
 endif()
 

cmake/SetupExports.cmake

@@ -27,13 +27,17 @@ include(CMakePackageConfigHelpers)
 include(GNUInstallDirs)
 
 # Setup install of exported targets
-install(EXPORT TweenyTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Tweeny)
+install(
+    EXPORT TweenyTargets
+    NAMESPACE tweeny::
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/tweeny
+)
 
 # Macro to write config
 write_basic_package_version_file(
     "${CMAKE_CURRENT_BINARY_DIR}/TweenyConfigVersion.cmake"
     VERSION ${Tweeny_VERSION}
-    COMPATIBILITY AnyNewerVersion
+    COMPATIBILITY SameMajorVersion
 )
 
 # Setup install of version config