From 6374552a80db5bf1f838a389073799bfcadaa470 Mon Sep 17 00:00:00 2001 From: tupoy-ya <72797377+tupoy-ya@users.noreply.github.com> Date: Mon, 28 Nov 2022 21:27:43 +0500 Subject: [PATCH] chore(CMake): Absolutely unnecessary CMake changes. (#648) --- CMakeLists.txt | 3 +-- scripts/gtav-classes.cmake | 9 --------- scripts/imgui.cmake | 7 +++---- scripts/json.cmake | 5 ----- src/common.cpp | 1 - 5 files changed, 4 insertions(+), 21 deletions(-) delete mode 100644 src/common.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index e963181b..2d5d144f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,12 +38,11 @@ target_include_directories(YimMenu PRIVATE "${SRC_DIR}" "${json_SOURCE_DIR}/single_include" "${gtav_classes_SOURCE_DIR}" - "${minhook_SOURCE_DIR}/include" "${imgui_SOURCE_DIR}" ) target_precompile_headers(YimMenu PRIVATE "${SRC_DIR}/common.hpp") -target_link_libraries(YimMenu PRIVATE pugixml minhook g3log imgui d3dcompiler) +target_link_libraries(YimMenu PRIVATE pugixml minhook g3log imgui) # Warnings as errors set_property(TARGET YimMenu PROPERTY COMPILE_WARNING_AS_ERROR ON) diff --git a/scripts/gtav-classes.cmake b/scripts/gtav-classes.cmake index 2aa74280..1e48b54a 100644 --- a/scripts/gtav-classes.cmake +++ b/scripts/gtav-classes.cmake @@ -11,13 +11,4 @@ FetchContent_Declare( message("GTAV-Classes") if(NOT gtav_classes_POPULATED) FetchContent_Populate(gtav_classes) - - file(GLOB_RECURSE SRC_GTAV_CLASSES "${gtav_classes_SOURCE_DIR}/*.hpp") - - # Show GTAV-Classes project - add_library(gtav_classes "${SRC_GTAV_CLASSES}") - - source_group(TREE "${gtav_classes_SOURCE_DIR}" PREFIX "GTAV-Classes" FILES "${SRC_GTAV_CLASSES}") endif() -set_property(TARGET gtav_classes PROPERTY CXX_STANDARD 23) -set_target_properties(gtav_classes PROPERTIES LINKER_LANGUAGE CXX) diff --git a/scripts/imgui.cmake b/scripts/imgui.cmake index 153e75ff..128d75fb 100644 --- a/scripts/imgui.cmake +++ b/scripts/imgui.cmake @@ -12,10 +12,9 @@ if(NOT imgui_POPULATED) file(GLOB SRC_IMGUI "${imgui_SOURCE_DIR}/*.cpp" - "${imgui_SOURCE_DIR}/*.h" - "${imgui_SOURCE_DIR}/backends/imgui_impl_win32.*" - "${imgui_SOURCE_DIR}/backends/imgui_impl_dx11.*" - "${imgui_SOURCE_DIR}/misc/cpp/imgui_stdlib.*" + "${imgui_SOURCE_DIR}/backends/imgui_impl_win32.cpp" + "${imgui_SOURCE_DIR}/backends/imgui_impl_dx11.cpp" + "${imgui_SOURCE_DIR}/misc/cpp/imgui_stdlib.cpp" ) add_library(imgui STATIC ${SRC_IMGUI}) diff --git a/scripts/json.cmake b/scripts/json.cmake index 21f86590..014f3e74 100644 --- a/scripts/json.cmake +++ b/scripts/json.cmake @@ -10,8 +10,3 @@ FetchContent_Declare( ) message("json") FetchContent_MakeAvailable(json) - -# Show json project -add_library(json ${json_SOURCE_DIR}/single_include/nlohmann/json.hpp) -set_property(TARGET json PROPERTY CXX_STANDARD 23) -set_target_properties(json PROPERTIES LINKER_LANGUAGE CXX) diff --git a/src/common.cpp b/src/common.cpp deleted file mode 100644 index 7691e9d7..00000000 --- a/src/common.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "common.hpp" \ No newline at end of file