Compare commits

..

No commits in common. "7d44f8dfffb860bf34179d26c52a946c622fabd8" and "5ae4ac16b9582e1872b08f1296d969676fa97a26" have entirely different histories.

24 changed files with 29 additions and 29 deletions

View File

@ -8,7 +8,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_EXTENSIONS OFF)
function(toAbsolutePath SETVAR PATHS) function(toAbsolutePath SETVAR PATHS)
set(PATHS ${PATHS} ${ARGN})
set(RET_VAL "") set(RET_VAL "")
foreach(FILE ${PATHS}) foreach(FILE ${PATHS})
get_filename_component(TMP get_filename_component(TMP
@ -45,6 +44,7 @@ endif()
if(NB_BUILD_TESTS) if(NB_BUILD_TESTS)
message(STATUS "Building tests") message(STATUS "Building tests")
enable_testing() enable_testing()
set(GLFW_BUILD_TESTS ON CACHE BOOL "" FORCE)
include(FetchContent) include(FetchContent)
FetchContent_Declare( FetchContent_Declare(
gtest gtest
@ -56,7 +56,6 @@ if(NB_BUILD_TESTS)
endif() endif()
include(GoogleTest) include(GoogleTest)
set(GTEST_COLOR ON) set(GTEST_COLOR ON)
set(GLFW_BUILD_TESTS ON CACHE BOOL "" FORCE)
endif() endif()
if (NB_LOGGING) if (NB_LOGGING)
@ -73,6 +72,7 @@ endif()
# External Dep paths # External Dep paths
set(GLFW_PATH ../glfw/) set(GLFW_PATH ../glfw/)
set(GLAD_PATH ../glad/) set(GLAD_PATH ../glad/)
get_filename_component(GLFW_PATH ${GLFW_PATH} ABSOLUTE) get_filename_component(GLFW_PATH ${GLFW_PATH} ABSOLUTE)
get_filename_component(GLAD_PATH ${GLAD_PATH} ABSOLUTE) get_filename_component(GLAD_PATH ${GLAD_PATH} ABSOLUTE)

View File

@ -20,7 +20,7 @@ if(NB_SOURCE_FILES)
message("Using file timestamps...") message("Using file timestamps...")
doxygen_add_docs(NBEngineDocumentation doxygen_add_docs(NBEngineDocumentation
${NB_SOURCE_FILES} ${NB_INCLUDE_FILES} ${NB_SOURCE_FILES} ${NB_INCLUDE_FILES}
USE_STAMP USE_STAMP_FILE
COMMENT "Building documentation" COMMENT "Building documentation"
) )
else() else()

View File

@ -14,3 +14,4 @@ if (NB_CORE_INCLUDE OR NB_EVENTS_INCLUDE OR NB_GRAPHICS_INCLUDE)
list(APPEND NB_INCLUDE_FILES ${NB_CORE_INCLUDE} ${NB_GRAPHICS_INCLUDE} ${NB_EVENTS_INCLUDE}) list(APPEND NB_INCLUDE_FILES ${NB_CORE_INCLUDE} ${NB_GRAPHICS_INCLUDE} ${NB_EVENTS_INCLUDE})
set(NB_INCLUDE_FILES ${NB_INCLUDE_FILES} PARENT_SCOPE) set(NB_INCLUDE_FILES ${NB_INCLUDE_FILES} PARENT_SCOPE)
endif() endif()
message("${NB_INCLUDE_FILES}")

View File

@ -1,21 +1,21 @@
include_directories(./include) include_directories(./.)
toAbsolutePath(NB_CORE_SOURCE toAbsolutePath(NB_CORE_SOURCE "
./src/Errors.cpp ./src/Errors.cpp;
./src/Processes.cpp ./src/Processes.cpp;
./src/Logger.cpp ./src/Logger.cpp;
) ")
toAbsolutePath(NB_CORE_INCLUDE toAbsolutePath(NB_CORE_INCLUDE "
./include/ANSITerm.hpp ANSITerm.hpp;
./include/DataSink.hpp DataSink.hpp;
./include/Errors.hpp Errors.hpp;
./include/Logger.hpp Logger.hpp;
./include/Processes.hpp Processes.hpp;
./include/ThreadsafeQueue.hpp ThreadsafeQueue.hpp;
./include/Types.hpp Types.hpp;
./include/TypeTraits.hpp TypeTraits.hpp;
) ")
set(NB_CORE_SOURCE ${NB_CORE_SOURCE} PARENT_SCOPE) set(NB_CORE_SOURCE ${NB_CORE_SOURCE} PARENT_SCOPE)
set(NB_CORE_INCLUDE ${NB_CORE_INCLUDE} PARENT_SCOPE) set(NB_CORE_INCLUDE ${NB_CORE_INCLUDE} PARENT_SCOPE)

View File

@ -1,5 +1,4 @@
#include "Errors.hpp" #include "Errors.hpp"
#gay
namespace nb { namespace nb {

View File

@ -5,7 +5,7 @@ toAbsolutePath(NB_EVENTS_SOURCE
) )
toAbsolutePath(NB_EVENTS_INCLUDE toAbsolutePath(NB_EVENTS_INCLUDE
./include/Events.hpp ./Events.hpp
) )
set(NB_EVENTS_SOURCE ${NB_EVENTS_SOURCE} PARENT_SCOPE) set(NB_EVENTS_SOURCE ${NB_EVENTS_SOURCE} PARENT_SCOPE)

View File

@ -1,4 +1,4 @@
#include "Events.hpp" #include "Events.h"
namespace NB { namespace NB {

View File

@ -16,13 +16,13 @@ toAbsolutePath(NB_GRAPHICS_SOURCE
) )
toAbsolutePath(NB_GRAPHICS_INCLUDE toAbsolutePath(NB_GRAPHICS_INCLUDE
./include/Buffers.hpp ./Buffers.hpp
./include/Camera.hpp ./Camera.hpp
./include/Draw.hpp ./Draw.hpp
./include/GLLoad.hpp ./GLLoad.hpp
./include/shader.hpp ./shader.hpp
./include/VAOManager.hpp ./VAOManager.hpp
./include/Window.hpp ./Window.hpp
) )
set(NB_GRAPHICS_SOURCE ${NB_GRAPHICS_SOURCE} PARENT_SCOPE) set(NB_GRAPHICS_SOURCE ${NB_GRAPHICS_SOURCE} PARENT_SCOPE)