Get compiling on arch.

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

View file

@ -17,13 +17,13 @@ macro(integration_tests)
set(multiValueArgs FILES FILES_UNIX FILES_WINDOWS DEPENDENCIES) set(multiValueArgs FILES FILES_UNIX FILES_WINDOWS DEPENDENCIES)
cmake_parse_arguments(UNIT_TESTS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} ) 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) set(PLATFORM_FILES)
if(UNIX) if(UNIX)
list(APPEND PLATFORM_FILES ${UNIT_TESTS_UNIX_FILES} list(APPEND PLATFORM_FILES ${UNIT_TESTS_UNIX_FILES})
elseif(WIN32) elseif(WIN32)
list(APPEND PLATFORM_FILES ${UNIT_TESTS_WIN32_FILES} list(APPEND PLATFORM_FILES ${UNIT_TESTS_WIN32_FILES})
endif() endif()
add_executable(${TARGET_NAME} ${CMAKE_SOURCE_DIR}/test/test_runner.cpp 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_property(TARGET ${TARGET_NAME} PROPERTY FOLDER test/${UNIT_TESTS_MODULE_NAME})
set(UNIT_TEST_TARGETS ${UNIT_TEST_TARGETS} ${TARGET_NAME} PARENT_SCOPE) set(UNIT_TEST_TARGETS ${UNIT_TEST_TARGETS} ${TARGET_NAME} PARENT_SCOPE)
endmacro() endmacro()

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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