Cleanup some CMake things

Author: lefticus

CMakeLists.txt

@@ -10,21 +10,6 @@ set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
 include(FetchContent)
-
-set(FETCHCONTENT_UPDATES_DISCONNECTED TRUE)
-FetchContent_Declare(ftxui
-  GIT_REPOSITORY https://github.com/ArthurSonzogni/ftxui
-  GIT_TAG v3.0.0
-)
-
-FetchContent_GetProperties(ftxui)
-if(NOT ftxui_POPULATED)
-  FetchContent_Populate(ftxui)
-  add_subdirectory(${ftxui_SOURCE_DIR} ${ftxui_BINARY_DIR} EXCLUDE_FROM_ALL)
-endif()
-
-
-
 # Note: by default ENABLE_DEVELOPER_MODE is True
 # This means that all analysis (sanitizers, static analysis)
 # is enabled and all warnings are treated as errors
@@ -128,10 +113,6 @@ dynamic_project_options(
 
 target_compile_features(project_options INTERFACE cxx_std_${CMAKE_CXX_STANDARD})
 
-# We don't have any way of ensuring that all static dependencies are compiled with
-# address sanitizer enabled.
-target_compile_definitions(project_options INTERFACE _DISABLE_VECTOR_ANNOTATION)
-
 # configure files based on CMake configuration options
 add_subdirectory(configured_files)
 

conanfile.txt

@@ -7,6 +7,7 @@ docopt.cpp/0.6.3
 spdlog/1.10.0
 nlohmann_json/3.10.5
 lodepng/cci.20200615
+ftxui/3.0.0
 
 [generators]
 cmake_find_package_multi

src/CMakeLists.txt

@@ -1,4 +1,5 @@
 find_package(fmt CONFIG)
+find_package(ftxui CONFIG)
 find_package(spdlog CONFIG)
 find_package(docopt CONFIG)
 find_package(lodepng CONFIG)
@@ -23,7 +24,7 @@ add_executable(
   game_hacking_lesson_01.hpp
   game_hacking_lesson_02.cpp
   game_hacking_lesson_02.hpp
-        tile_set.hpp
+  tile_set.hpp
   game_components.cpp)
 
 target_link_libraries(

test/CMakeLists.txt

@@ -1,6 +1,8 @@
 find_package(Catch2 REQUIRED)
 
-include(CTest)
+enable_testing()
+
+#include(CTest)
 include(Catch)
 
 add_library(catch_main OBJECT catch_main.cpp)