1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-05-13 22:06:58 +02:00

Merge pull request #2845 from Alexander-Wilms/fuzzylite

Support include path of more recent fuzzylite versions
This commit is contained in:
Andrii Danylchenko 2023-09-16 11:05:55 +03:00 committed by GitHub
commit 988531c6cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 5 deletions

View File

@ -8,7 +8,11 @@
*
*/
#pragma once
#include <fl/Headers.h>
#if __has_include(<fuzzylite/Headers.h>)
# include <fuzzylite/Headers.h>
#else
# include <fl/Headers.h>
#endif
#include "../Goals/AbstractGoal.h"
VCMI_LIB_NAMESPACE_BEGIN

View File

@ -8,7 +8,11 @@
*
*/
#pragma once
#include "fl/Headers.h"
#if __has_include(<fuzzylite/Headers.h>)
# include <fuzzylite/Headers.h>
#else
# include <fl/Headers.h>
#endif
#include "../Goals/CGoal.h"
#include "../Pathfinding/AIPathfinder.h"

View File

@ -8,7 +8,11 @@
*
*/
#pragma once
#include <fl/Headers.h>
#if __has_include(<fuzzylite/Headers.h>)
# include <fuzzylite/Headers.h>
#else
# include <fl/Headers.h>
#endif
#include "Goals/AbstractGoal.h"
VCMI_LIB_NAMESPACE_BEGIN

View File

@ -21,11 +21,13 @@
find_path(fuzzylite_INCLUDE_DIR
fl/fuzzylite.h
fuzzylite/fuzzylite.h
HINTS
ENV FLDIR
PATH_SUFFIXES
fl
include/fl
include/fl
include/fuzzylite
include
)
@ -62,4 +64,4 @@ if (NOT TARGET "fuzzylite::fuzzylite" AND fuzzylite_FOUND)
IMPORTED_LOCATION "${fuzzylite_LIBRARY}")
endif()
mark_as_advanced(fuzzylite_LIBRARY fuzzylite_INCLUDE_DIR)
mark_as_advanced(fuzzylite_LIBRARY fuzzylite_INCLUDE_DIR)