Add vvis, vmpi, lzma and libcurl to CMake

Author: Masterkatze

src/CMakeLists.txt

@@ -36,6 +36,7 @@ option(NEO_BUILD_TIER1 "Build tier1 library" ON)
 option(NEO_BUILD_MATHLIB "Build mathlib library" ON)
 option(NEO_BUILD_VGUI_CONTROLS "Build vgui_controls library" ON)
 option(NEO_BUILD_UTILS "Build utils" ON)
+option(NEO_VMPI "Use VMPI in utils" ON)
 option(NEO_COPY_LIBRARIES "Copy libraries to bin directory by default" ON)
 option(NEO_EXTRA_ASSETS "Copy extra assets into game/neo" ON)
 if (OS_LINUX)
@@ -64,6 +65,7 @@ message(STATUS "Build tier1 library: ${NEO_BUILD_TIER1}")
 message(STATUS "Build mathlib library: ${NEO_BUILD_MATHLIB}")
 message(STATUS "Build vgui_controls library: ${NEO_BUILD_VGUI_CONTROLS}")
 message(STATUS "Build utils: ${NEO_BUILD_UTILS}")
+message(STATUS "Use VMPI in utils: ${NEO_VMPI}")
 message(STATUS "Copy libraries to bin directory by default: ${NEO_COPY_LIBRARIES}")
 message(STATUS "Copy extra assets into game/neo: ${NEO_EXTRA_ASSETS}")
 message(STATUS "Directory for output libraries: ${NEO_OUTPUT_LIBRARY_PATH}")
@@ -395,6 +397,7 @@ if(NEO_USE_CCACHE)
     )
 endif()
 
+add_subdirectory(thirdparty)
 add_subdirectory(lib)
 
 if(NEO_GENERATE_GAMEDATA)

src/cmake/FindLibZ.cmake

@@ -0,0 +1,22 @@
+if(OS_WINDOWS)
+    set(LIBZ_LIBRARY_NAME libz.lib)
+elseif(OS_LINUX OR OS_MACOS)
+    return() # TODO Linux
+endif()
+
+find_file(LIBZ_LIBRARY
+    NAMES ${LIBZ_LIBRARY_NAME}
+    PATHS "${LIBPUBLIC}"
+    NO_CACHE
+    NO_DEFAULT_PATH
+    REQUIRED
+)
+
+mark_as_advanced(LIBZ_LIBRARY)
+
+add_library(libz_libz STATIC IMPORTED GLOBAL)
+add_library(libz::libz ALIAS libz_libz)
+
+set_target_properties(libz_libz PROPERTIES
+    IMPORTED_LOCATION "${LIBZ_LIBRARY}"
+)

src/cmake/FindTier0.cmake

@@ -28,4 +28,9 @@ elseif(OS_LINUX OR OS_MACOS)
     )
 endif()
 
-set_target_properties(tier0_tier0 PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}/public/tier0")
+target_include_directories(tier0_tier0
+    INTERFACE
+    "${CMAKE_SOURCE_DIR}/common"
+    "${CMAKE_SOURCE_DIR}/public"
+    "${CMAKE_SOURCE_DIR}/public/tier0"
+)

src/cmake/FindTier2.cmake

@@ -19,5 +19,14 @@ add_library(tier2::tier2 ALIAS tier2_tier2)
 
 set_target_properties(tier2_tier2 PROPERTIES
     IMPORTED_LOCATION "${TIER2_LIBRARY}"
-    INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}/public/tier2"
+)
+
+target_include_directories(tier2_tier2
+    INTERFACE
+    "${CMAKE_SOURCE_DIR}/public/tier2"
+)
+
+target_link_libraries(tier2_tier2
+    INTERFACE
+    tier1::tier1
 )

src/cmake/FindTier3.cmake

@@ -19,5 +19,14 @@ add_library(tier3::tier3 ALIAS tier3_tier3)
 
 set_target_properties(tier3_tier3 PROPERTIES
     IMPORTED_LOCATION "${TIER3_LIBRARY}"
-    INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}/public/tier3"
+)
+
+target_include_directories(tier3_tier3
+    INTERFACE
+    "${CMAKE_SOURCE_DIR}/public/tier3"
+)
+
+target_link_libraries(tier3_tier3
+    INTERFACE
+    tier2::tier2
 )

src/fgdlib/CMakeLists.txt

@@ -6,8 +6,6 @@ set_target_properties(fgdlib PROPERTIES PREFIX "")
 
 target_include_directories(fgdlib
     PRIVATE
-    ${CMAKE_SOURCE_DIR}/common
-    ${CMAKE_SOURCE_DIR}/public
     ${CMAKE_SOURCE_DIR}/utils/common
 )
 
@@ -24,7 +22,6 @@ target_compile_options(fgdlib
 
 target_link_libraries(fgdlib
     PRIVATE
-    tier0::tier0
     tier1::tier1
     mathlib::mathlib
 )

src/game/client/CMakeLists.txt

@@ -14,15 +14,13 @@ endif()
 
 target_include_directories(client
     PRIVATE
-    ${CMAKE_SOURCE_DIR}/common
     ${CMAKE_SOURCE_DIR}/game/client
     ${CMAKE_SOURCE_DIR}/game/shared
     ${CMAKE_SOURCE_DIR}/game/shared/hl2
     ${CMAKE_SOURCE_DIR}/game/shared/hl2mp
     ${CMAKE_SOURCE_DIR}/game/shared/Multiplayer
     ${CMAKE_SOURCE_DIR}/game/shared/neo
     ${CMAKE_SOURCE_DIR}/game/shared/neo/weapons
-    ${CMAKE_SOURCE_DIR}/public
     ${CMAKE_SOURCE_DIR}/thirdparty/sixensesdk/include
     ${CMAKE_SOURCE_DIR}/vendor
     ${CMAKE_SOURCE_DIR}/game/client/NextBot
@@ -54,9 +52,6 @@ target_link_libraries(client
     mathlib::mathlib
     choreo_objects::choreo_objects
     dmx_loader::dmx_loader
-    tier0::tier0
-    tier1::tier1
-    tier2::tier2
     tier3::tier3
     matsys_controls::matsys_controls
     vstdlib::vstdlib

src/game/server/CMakeLists.txt

@@ -31,7 +31,6 @@ endif()
 target_include_directories(server
     PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/common
     ${CMAKE_SOURCE_DIR}/game/server
     ${CMAKE_SOURCE_DIR}/game/server/hl2
     ${CMAKE_SOURCE_DIR}/game/server/hl2mp
@@ -44,7 +43,6 @@ target_include_directories(server
     ${CMAKE_SOURCE_DIR}/game/shared/neo
     ${CMAKE_SOURCE_DIR}/game/shared/neo/weapons
     ${CMAKE_SOURCE_DIR}/utils/common
-    ${CMAKE_SOURCE_DIR}/public
 )
 
 target_compile_definitions(server
@@ -69,9 +67,6 @@ target_link_libraries(server
     choreo_objects::choreo_objects
     dmx_loader::dmx_loader
     particles::particles
-    tier0::tier0
-    tier1::tier1
-    tier2::tier2
     tier3::tier3
     vstdlib::vstdlib
     steam_api::steam_api

src/lib/CMakeLists.txt

@@ -1,7 +1,10 @@
-find_package(Appframework)
+find_package(AppFramework)
 find_package(Bitmap)
 find_package(ChoreoObjects)
+#find_package(DataModel)
 find_package(DMXLoader)
+#find_package(GCSDK)
+find_package(LibZ)
 find_package(MatSysControls)
 
 if(NEO_BUILD_MATHLIB)
@@ -11,6 +14,7 @@ else()
 endif()
 
 find_package(Particles)
+#find_package(ShaderLib)
 find_package(SteamAPI)
 find_package(Tier0)
 
@@ -29,5 +33,6 @@ else()
     find_package(VGUIControls)
 endif()
 
+#find_package(VPKLib)
 find_package(VSTDLib)
-find_package(VTF)
+find_package(VTF)

src/materialsystem/stdshaders/CMakeLists.txt

@@ -14,11 +14,9 @@ endif()
 
 target_include_directories(game_shader_dx9
     PRIVATE
-        ${CMAKE_SOURCE_DIR}/common
-        ${CMAKE_SOURCE_DIR}/public
-        fxctmp9
-        vshtmp9
-	include
+    fxctmp9
+    vshtmp9
+    include
 )
 
 target_compile_definitions(game_shader_dx9
@@ -52,8 +50,6 @@ endif()
 
 target_link_libraries(game_shader_dx9
     PRIVATE
-    tier0::tier0
-    tier1::tier1
     tier2::tier2
     mathlib::mathlib
     vstdlib::vstdlib