Move yaml.h, gekko_support.h to include/athena

Check if atdna target defined before
hsh
Luke Street 3 years ago
parent b67f6dc231
commit 8558ca1b51
  1. 4
      CMakeLists.txt
  2. 6
      atdna/CMakeLists.txt
  3. 2
      extern/yaml/src/yaml_private.h
  4. 2
      include/athena/YAMLCommon.hpp
  5. 0
      include/athena/gekko_support.h
  6. 0
      include/athena/yaml.h
  7. 2
      src/gekko_support.c

@ -185,7 +185,7 @@ add_library(athena-core
include/athena/YAMLCommon.hpp
include/athena/YAMLDocReader.hpp
include/athena/YAMLDocWriter.hpp
include/yaml.h
include/athena/yaml.h
include/athena/utf8proc.h
)
if(WIN32)
@ -214,7 +214,7 @@ else()
if(GEKKO OR NX)
target_sources(athena-core PRIVATE
src/gekko_support.c
include/gekko_support.h
include/athena/gekko_support.h
)
endif()
endif()

@ -2,7 +2,7 @@
# ATDNA Build #
###############
if(NOT CMAKE_CROSSCOMPILING)
if(NOT TARGET atdna AND NOT CMAKE_CROSSCOMPILING)
get_directory_property(ATDNA_DEFINES COMPILE_DEFINITIONS)
list(REMOVE_ITEM ATDNA_DEFINES _GLIBCXX_DEBUG=1)
@ -149,6 +149,6 @@ endif()
endif()
include(atdnaHelpers.cmake)
endif()
include(atdnaHelpers.cmake)

@ -1,7 +1,7 @@
#include "config.h"
#include <yaml.h>
#include <athena/yaml.h>
#include <assert.h>
#include <limits.h>

@ -8,7 +8,7 @@
#include <string>
#include <vector>
#include <yaml.h>
#include "yaml.h"
#include "athena/Types.hpp"

@ -1,5 +1,5 @@
#if defined(GEKKO) || defined(__SWITCH__)
#include "gekko_support.h"
#include "athena/gekko_support.h"
#define SYMLOOP_MAX 8
#include <sys/stat.h>
#include <sys/param.h>

Loading…
Cancel
Save