Browse Source

define FL_CPP11 outside Fuzzylite source

Mikhail Paulyshka 11 years ago
parent
commit
d0da88a515
2 changed files with 2 additions and 1 deletions
  1. 1 0
      AI/CMakeLists.txt
  2. 1 1
      AI/VCAI/CMakeLists.txt

+ 1 - 0
AI/CMakeLists.txt

@@ -7,6 +7,7 @@ if (NOT FL_FOUND)
     set(FL_BUILD_BINARY OFF CACHE BOOL "")
     set(FL_BUILD_SHARED OFF CACHE BOOL "")
     if(NOT MSVC)
+        add_definitions(-DFL_CPP11)
         set(FL_CPP11 ON CACHE BOOL "")
     endif()
     add_subdirectory(FuzzyLite/fuzzylite)

+ 1 - 1
AI/VCAI/CMakeLists.txt

@@ -1,7 +1,7 @@
 project(VCAI)
 cmake_minimum_required(VERSION 2.6)
 
-if (FUZZYLITE_FOUND)
+if (FL_FOUND)
     include_directories(${Boost_INCLUDE_DIRS} ${CMAKE_HOME_DIRECTORY} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_HOME_DIRECTORY}/lib ${FL_INCLUDE_DIRS})
 else()
     include_directories(${Boost_INCLUDE_DIRS} ${CMAKE_HOME_DIRECTORY} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_HOME_DIRECTORY}/lib ${CMAKE_HOME_DIRECTORY}/AI/FuzzyLite/fuzzylite)