From 2933b92eb3379f114a8be246fdfb7746c37daf9c Mon Sep 17 00:00:00 2001 From: TotallyNotElite <1yourexperiment@protonmail.com> Date: Tue, 14 Aug 2018 21:00:33 +0200 Subject: [PATCH] Fix cmake failed cmake pls --- .gitignore | 4 ++++ .gitmodules | 6 +++--- CMakeLists.txt | 1 + external/PathFinder | 1 - external/TF2_NavFile_Reader | 2 +- include/CMakeLists.txt | 1 - include/TF2_NavFile_Reader | 1 - src/CMakeLists.txt | 2 +- 8 files changed, 10 insertions(+), 8 deletions(-) mode change 100755 => 100644 .gitmodules delete mode 160000 external/PathFinder delete mode 160000 include/TF2_NavFile_Reader diff --git a/.gitignore b/.gitignore index 455212fd..79caed0d 100755 --- a/.gitignore +++ b/.gitignore @@ -278,3 +278,7 @@ cathook.cbp .cproject .settings \.directory + +\.kdev4/cathook\.kdev4 + +cathook\.kdev4 diff --git a/.gitmodules b/.gitmodules old mode 100755 new mode 100644 index 18405cfe..69b2bfe8 --- a/.gitmodules +++ b/.gitmodules @@ -16,9 +16,9 @@ [submodule "external/co-library"] path = external/co-library url = https://github.com/nullworks/co-library.git -[submodule "include/TF2_NavFile_Reader"] - path = include/TF2_NavFile_Reader - url = https://github.com/nullworks/TF2_NavFile_Reader.git [submodule "external/MicroPather"] path = external/MicroPather url = https://github.com/leethomason/MicroPather +[submodule "external/TF2_NavFile_Reader"] + path = external/TF2_NavFile_Reader + url = https://github.com/nullworks/TF2_NavFile_Reader diff --git a/CMakeLists.txt b/CMakeLists.txt index 1d20b371..ca19f3b8 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -112,6 +112,7 @@ target_include_directories(cathook SYSTEM PRIVATE target_include_directories(cathook PRIVATE "external/ucccccp") target_include_directories(cathook PRIVATE "external/MicroPather") +target_include_directories(cathook PRIVATE "external/TF2_NavFile_Reader") if(EnableWarnings) target_compile_options(cathook PRIVATE -Wall -Wextra) diff --git a/external/PathFinder b/external/PathFinder deleted file mode 160000 index 03bac251..00000000 --- a/external/PathFinder +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 03bac25118aaa65822d036ac9f3b82124b681ad9 diff --git a/external/TF2_NavFile_Reader b/external/TF2_NavFile_Reader index cf0ac17c..65818ea2 160000 --- a/external/TF2_NavFile_Reader +++ b/external/TF2_NavFile_Reader @@ -1 +1 @@ -Subproject commit cf0ac17c8b3a44d99cf746c981186ca00c93be3b +Subproject commit 65818ea2cda4fa3f8e3f17e272692543f704d1f4 diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index f8f33bfe..1d2601d5 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -50,7 +50,6 @@ add_subdirectory(classinfo) add_subdirectory(copypasted) add_subdirectory(hacks) add_subdirectory(hooks) -add_subdirectory(TF2_NavFile_Reader) add_subdirectory(reclasses) add_subdirectory(sdk) add_subdirectory(online) diff --git a/include/TF2_NavFile_Reader b/include/TF2_NavFile_Reader deleted file mode 160000 index 65818ea2..00000000 --- a/include/TF2_NavFile_Reader +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 65818ea2cda4fa3f8e3f17e272692543f704d1f4 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c54107fb..97b8202a 100755 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -32,7 +32,7 @@ target_sources(cathook PRIVATE "${CMAKE_CURRENT_LIST_DIR}/velocity.cpp" "${CMAKE_CURRENT_LIST_DIR}/votelogger.cpp" "${CMAKE_CURRENT_LIST_DIR}/MiscTemporary.cpp" - "${CMAKE_CURRENT_LIST_DIR}/navparser.cpp" + "${CMAKE_CURRENT_LIST_DIR}/navparser.cpp" "${CMAKE_CURRENT_LIST_DIR}/Options.cpp" "${CMAKE_CURRENT_LIST_DIR}/PlayerTools.cpp")