Merge 63a74a92a8 into c9e1a63378

CMakeLists.txt

@@ -1,8 +1,6 @@
 cmake_minimum_required(VERSION 3.27)
 project(clay)
 
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-
 add_subdirectory("examples/cpp-project-example")
 
 # Don't try to compile C99 projects using MSVC

clay.h

@@ -134,7 +134,7 @@ CLAY__ALIGNMENT_STRUCT(bool);
 CLAY__ALIGNMENT_STRUCT(uint8_t);
 CLAY__ALIGNMENT_STRUCT(int32_t);
 
-#if defined(_MSC_VER) && !defined(__clang__)
+#ifdef _MSC_VER
 #define CLAY_PACKED_ENUM __pragma(pack(push, 1)) enum __pragma(pack(pop))
 #else
 #define CLAY_PACKED_ENUM enum __attribute__((__packed__))

cmake/FindCairo.cmake

@@ -1,32 +0,0 @@
-# Defines:
-#  CAIRO_FOUND        - System has Cairo
-#  CAIRO_INCLUDE_DIRS - Cairo include directories
-#  CAIRO_LIBRARY      - Cairo library
-#  Cairo::Cairo       - Imported target
-
-find_path(CAIRO_INCLUDE_DIRS
-        NAMES cairo/cairo.h
-        PATHS ${CAIRO_ROOT_DIR}
-        PATH_SUFFIXES include
-)
-
-find_library(CAIRO_LIBRARY
-        NAMES cairo
-        PATHS ${CAIRO_ROOT_DIR}
-        PATH_SUFFIXES lib lib64
-)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Cairo
-        REQUIRED_VARS CAIRO_LIBRARY CAIRO_INCLUDE_DIRS
-)
-
-if(Cairo_FOUND AND NOT TARGET Cairo::Cairo)
-    add_library(Cairo::Cairo UNKNOWN IMPORTED)
-    set_target_properties(Cairo::Cairo PROPERTIES
-            IMPORTED_LOCATION "${CAIRO_LIBRARY}"
-            INTERFACE_INCLUDE_DIRECTORIES "${CAIRO_INCLUDE_DIRS}"
-    )
-endif()
-
-mark_as_advanced(CAIRO_INCLUDE_DIRS CAIRO_LIBRARY)

examples/cairo-pdf-rendering/CMakeLists.txt

@@ -2,17 +2,13 @@ cmake_minimum_required(VERSION 3.27)
 project(clay_examples_cairo_pdf_rendering C)
 set(CMAKE_C_STANDARD 99)
 
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../cmake")
-
-
 add_executable(clay_examples_cairo_pdf_rendering main.c)
 
-find_package(Cairo REQUIRED)
-
 target_compile_options(clay_examples_cairo_pdf_rendering PUBLIC)
-target_include_directories(clay_examples_cairo_pdf_rendering PUBLIC . ${CAIRO_INCLUDE_DIRS})
+target_include_directories(clay_examples_cairo_pdf_rendering PUBLIC .)
+
+target_link_libraries(clay_examples_cairo_pdf_rendering PUBLIC cairo)
 
-target_link_libraries(clay_examples_cairo_pdf_rendering PUBLIC Cairo::Cairo)
 set(CMAKE_C_FLAGS_DEBUG "-Wall -Werror -Wno-error=missing-braces")
 set(CMAKE_C_FLAGS_RELEASE "-O3")
 

examples/cpp-project-example/CMakeLists.txt

@@ -8,5 +8,5 @@ add_executable(clay_examples_cpp_project_example main.cpp)
 
 target_include_directories(clay_examples_cpp_project_example PUBLIC .)
 
-set(CMAKE_CXX_FLAGS_DEBUG "-Werror -Wall -Wno-error=missing-braces")
-set(CMAKE_CXX_FLAGS_RELEASE "-O3")
+set(CMAKE_C_FLAGS_DEBUG "-Werror -Wall -Wno-error=missing-braces")
+set(CMAKE_C_FLAGS_RELEASE "-O3")