games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-10-08 23:22:25 +02:00
Code Issues Releases Activity

Fix AI and VCAI CMakeLists.txt

Browse Source
This commit is contained in:
Mikhail Paulyshka
2014-11-02 23:43:10 +03:00
parent a867faae1e
commit 941dcee0f5
3 changed files with 69 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
AI/CMakeLists.txt
View File

@@ -1,18 +1,14 @@
project(AI) project(AI)
cmake_minimum_required(VERSION 2.6) cmake_minimum_required(VERSION 2.8)
find_path(FUZZYLITE_INCLUDE_PATH NAMES fl/fuzzylite.h) find_package(Fuzzylite)
find_library(FUZZYLITE_LIB NAMES fuzzylite PATH_SUFFIXES dynamic)
mark_as_advanced(FUZZYLITE_INCLUDE_PATH FUZZYLITE_LIB)
INCLUDE(FindPackageHandleStandardArgs) if (NOT FL_FOUND)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(FUZZYLITE FUZZYLITE_INCLUDE_PATH FUZZYLITE_LIB) set(FL_BUILD_BINARY OFF CACHE BOOL "")
if (FUZZYLITE_FOUND) set(FL_BUILD_SHARED OFF CACHE BOOL "")
set (FUZZYLITE_LIBRARIES ${FUZZYLITE_LIB}) if(NOT MSVC)
set (FUZZYLITE_INCLUDE_DIR ${FUZZYLITE_INCLUDE_PATH}) set(FL_CPP11 ON CACHE BOOL "")
endif() endif()
if (NOT FUZZYLITE_FOUND)
add_subdirectory(FuzzyLite/fuzzylite) add_subdirectory(FuzzyLite/fuzzylite)
endif() endif()
add_subdirectory(BattleAI) add_subdirectory(BattleAI)

8
AI/VCAI/CMakeLists.txt
View File

@@ -1,10 +1,8 @@
project(VCAI) project(VCAI)
cmake_minimum_required(VERSION 2.6) cmake_minimum_required(VERSION 2.6)
add_definitions(-DFL_CPP11) #TODO: Find a better way to set this macro for fuzzylite
if (FUZZYLITE_FOUND) if (FUZZYLITE_FOUND)
include_directories(${Boost_INCLUDE_DIRS} ${CMAKE_HOME_DIRECTORY} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_HOME_DIRECTORY}/lib ${FUZZYLITE_INCLUDE_DIR}) include_directories(${Boost_INCLUDE_DIRS} ${CMAKE_HOME_DIRECTORY} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_HOME_DIRECTORY}/lib ${FL_INCLUDE_DIRS})
else() else()
include_directories(${Boost_INCLUDE_DIRS} ${CMAKE_HOME_DIRECTORY} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_HOME_DIRECTORY}/lib ${CMAKE_HOME_DIRECTORY}/AI/FuzzyLite/fuzzylite) include_directories(${Boost_INCLUDE_DIRS} ${CMAKE_HOME_DIRECTORY} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_HOME_DIRECTORY}/lib ${CMAKE_HOME_DIRECTORY}/AI/FuzzyLite/fuzzylite)
endif() endif()
@@ -19,8 +17,8 @@ set(VCAI_SRCS
) )
add_library(VCAI SHARED ${VCAI_SRCS}) add_library(VCAI SHARED ${VCAI_SRCS})
if (FUZZYLITE_FOUND) if (FL_FOUND)
target_link_libraries(VCAI ${FUZZYLITE_LIBRARIES} vcmi) target_link_libraries(VCAI ${FL_LIBRARIES} vcmi)
else() else()
target_link_libraries(VCAI fl-static vcmi) target_link_libraries(VCAI fl-static vcmi)
endif() endif()

57
cmake_modules/FindFuzzylite.cmake Normal file
View File

@@ -0,0 +1,57 @@
#.rst:
# FindFuzzylite
# --------
#
# Locate Fuzzylite library
#
#=============================================================================
# Copyright 2003-2009 Kitware, Inc.
# Copyright 2012 Benjamin Eikel
# Copyright 2014 Mikhail Paulyshka
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file kitware license.txt for details.
#
# This software is distributed WITHOUT ANY WARRANTY; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information.
#=============================================================================
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)
find_path(FL_INCLUDE_DIR
fl/fuzzylite.h
HINTS
ENV FLDIR
PATH_SUFFIXES
fl
include/fl
include
)
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(VC_LIB_PATH_SUFFIX lib/x64)
else()
set(VC_LIB_PATH_SUFFIX lib/x86)
endif()
find_library(FL_LIBRARY
NAMES
fuzzylite
HINTS
ENV FLDIR
PATH_SUFFIXES
dynamic
lib
${VC_LIB_PATH_SUFFIX}
)
set(FL_LIBRARIES ${FL_LIBRARY})
set(FL_INCLUDE_DIRS ${FL_INCLUDE_DIR})
include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(FL
REQUIRED_VARS FL_LIBRARIES FL_INCLUDE_DIRS)
mark_as_advanced(FL_LIBRARY FL_INCLUDE_DIR)