diff --git a/CMakeLists.txt b/CMakeLists.txt index a8e8360..8a4bb53 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,13 +2,14 @@ cmake_minimum_required(VERSION 3.20) project(cpp_template) -include(cmake/configure.cmake) - include_directories(include) enable_testing() add_subdirectory(3rdparty) + +include(cmake/configure.cmake) + add_subdirectory(app) add_subdirectory(include) add_subdirectory(src) diff --git a/cmake/configure.cmake b/cmake/configure.cmake index 14d12f5..57b7b6d 100644 --- a/cmake/configure.cmake +++ b/cmake/configure.cmake @@ -8,11 +8,9 @@ set(CMAKE_CXX_STANDARD 23) set(CMAKE_CXX_STANDARD_REQUIRED ON) if(UNIX) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wsign-compare -Werror") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wsign-compare -Werror") -endif(UNIX) + add_compile_options(-Wall -Wextra -Wsign-compare -Werror) +endif() if(MSVC) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4 /wd4267 /wd4244 /wd4100 /WX") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4 /wd4267 /wd4244 /wd4100 /WX") -endif(MSVC) + add_compile_options(/W4 /wd4267 /wd4244 /wd4100 /WX) +endif()