2
0
Эх сурвалжийг харах

Bump fuzzylite submodule to latest commit

Ivan Savenko 6 сар өмнө
parent
commit
40870d8f64
2 өөрчлөгдсөн 4 нэмэгдсэн , 9 устгасан
  1. 3 8
      AI/CMakeLists.txt
  2. 1 1
      AI/FuzzyLite

+ 3 - 8
AI/CMakeLists.txt

@@ -30,14 +30,9 @@ if(NOT fuzzylite_FOUND)
 	if(ANDROID)
 		set(FL_BACKTRACE OFF CACHE BOOL "" FORCE)
 	endif()
-	#It is for compiling FuzzyLite, it will not compile without it on GCC
-	if("x${CMAKE_CXX_COMPILER_FRONTEND_VARIANT}" STREQUAL "xGNU" OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
-		add_compile_options(-Wno-error=deprecated-declarations)
-	endif()
-	add_subdirectory(FuzzyLite/fuzzylite EXCLUDE_FROM_ALL)
-	set_property(TARGET fl-static PROPERTY CXX_STANDARD 14) # doesn't compile under 17 due to using removed symbol(s)
-	add_library(fuzzylite::fuzzylite ALIAS fl-static)
-	target_include_directories(fl-static PUBLIC ${CMAKE_HOME_DIRECTORY}/AI/FuzzyLite/fuzzylite)
+
+	add_subdirectory(FuzzyLite EXCLUDE_FROM_ALL)
+	add_library(fuzzylite::fuzzylite ALIAS staticTarget)
 endif()
 
 #######################################

+ 1 - 1
AI/FuzzyLite

@@ -1 +1 @@
-Subproject commit 7aee562d6ca17f3cf42588ffb5116e03017c3c50
+Subproject commit 13b3122f5c353c0389ed4e66041d548c44ec9df6