jgrogan/stuff-from-scratch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Get compiling on arch.

Browse source
This commit is contained in:
jmsgrogan 2023-09-24 12:33:38 +01:00
parent 22c552b50f
commit 7da1d2d539
7 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
infra/cmake/TestTargets.cmake
View file

@ -17,13 +17,13 @@ macro(integration_tests)
set(multiValueArgs FILES FILES_UNIX FILES_WINDOWS DEPENDENCIES)
cmake_parse_arguments(UNIT_TESTS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )
set(TARGET_NAME ${UNIT_TESTS_MODULE_NAME}_unit_tests)
set(TARGET_NAME ${UNIT_TESTS_MODULE_NAME}_integration_tests)
set(PLATFORM_FILES)
if(UNIX)
list(APPEND PLATFORM_FILES ${UNIT_TESTS_UNIX_FILES}
list(APPEND PLATFORM_FILES ${UNIT_TESTS_UNIX_FILES})
elseif(WIN32)
list(APPEND PLATFORM_FILES ${UNIT_TESTS_WIN32_FILES}
list(APPEND PLATFORM_FILES ${UNIT_TESTS_WIN32_FILES})
endif()
add_executable(${TARGET_NAME} ${CMAKE_SOURCE_DIR}/test/test_runner.cpp
@ -35,4 +35,4 @@ macro(integration_tests)
set_property(TARGET ${TARGET_NAME} PROPERTY FOLDER test/${UNIT_TESTS_MODULE_NAME})
set(UNIT_TEST_TARGETS ${UNIT_TEST_TARGETS} ${TARGET_NAME} PARENT_SCOPE)
endmacro()
endmacro()

1
src/base/compression/huffman/HuffmanTree.h
View file

@ -3,6 +3,7 @@
#include <vector>
#include <string>
#include <optional>
#include <cstdint>
class PrefixCode
{

3
src/base/core/encoding/UnicodeUtils.cpp
View file

@ -4,6 +4,7 @@
#include <vector>
#include <stdexcept>
#include <cstdint>
std::string UnicodeUtils::utf16ToUtf8String(const std::wstring& input)
{
@ -88,4 +89,4 @@ bool UnicodeUtils::isLowSurrogate(wchar_t c)
uint32_t UnicodeUtils::surrogateToUtf32(wchar_t high, wchar_t low)
{
return (high << 10) + low - 0x35fdc00;
}
}

3
src/base/core/encoding/UnicodeUtils.h
View file

@ -2,6 +2,7 @@
#include <string>
#include <vector>
#include <cstdint>
class UnicodeUtils
{
@ -17,4 +18,4 @@ private:
static bool isHighSurrogate(wchar_t c);
static bool isLowSurrogate(wchar_t c);
static uint32_t surrogateToUtf32(wchar_t high, wchar_t low);
};
};

1
src/media/image/png/PngHeader.h
View file

@ -3,6 +3,7 @@
#include "PngInfo.h"
#include <vector>
#include <cstdint>
class PngHeader
{

2
src/ui/windows/CMakeLists.txt
View file

@ -5,7 +5,7 @@ set (platform_LIBS "")
if(UNIX)
message(STATUS "Checking dependencies for module: window")
find_package(X11 QUIET)
#Find_package(X11 QUIET)
if(X11_FOUND)
list(APPEND platform_INCLUDES
ui_interfaces/x11/XcbInterface.cpp

4
test/ipc/CMakeLists.txt
View file

@ -6,7 +6,7 @@ if (DBUS_FOUND)
include_directories(${DBUS_INCLUDE_DIRS})
link_directories(${DBUS_LIBRARY_DIRS})
set(PLATFORM_UNIT_TEST_FILES
ipc/TestDbus.cpp
#ipc/TestDbus.cpp
)
endif()
@ -17,4 +17,4 @@ set(IPC_UNIT_TEST_FILES
set(IPC_UNIT_TEST_DEPENDENCIES
PARENT_SCOPE
)
)