Skip to content

Commit

Permalink
Update vcpkg to latest
Browse files Browse the repository at this point in the history
  • Loading branch information
amaiorano committed Dec 23, 2023
1 parent 8866ab5 commit 768c0b5
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion external/vcpkg
Submodule vcpkg updated 10293 files
10 changes: 6 additions & 4 deletions libs/core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ add_library(${MODULE_NAME} ${SRC_FILES})

if(USE_SDL_ENGINE)
find_package(SDL2 CONFIG REQUIRED)
find_package(sdl2-net CONFIG REQUIRED)
find_package(SDL2_net CONFIG REQUIRED)
endif()
if(DEBUG_UI)
find_package(imgui CONFIG REQUIRED)
Expand All @@ -21,9 +21,11 @@ if(LINUX)
endif()

# Make a wrapper module for STB
find_path(STB_INCLUDE_DIRS "stb.h" REQUIRED)
find_package(Stb REQUIRED)
#target_include_directories(main PRIVATE ${Stb_INCLUDE_DIR})
#find_path(STB_INCLUDE_DIRS "stb.h" REQUIRED)
add_library(STB INTERFACE)
target_include_directories(STB INTERFACE ${STB_INCLUDE_DIRS})
target_include_directories(STB INTERFACE ${Stb_INCLUDE_DIR})

target_include_directories(${MODULE_NAME}
PUBLIC "include"
Expand All @@ -37,7 +39,7 @@ target_link_libraries(${MODULE_NAME}
noc
$<$<BOOL:${LINUX}>:linenoise>
$<$<BOOL:${USE_SDL_ENGINE}>:SDL2::SDL2>
$<$<BOOL:${USE_SDL_ENGINE}>:SDL2::SDL2_net>
$<$<BOOL:${USE_SDL_ENGINE}>:SDL2_net::SDL2_net-static>
)

if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
Expand Down
4 changes: 2 additions & 2 deletions libs/sdl_engine/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ find_package(GLEW CONFIG REQUIRED)
find_package(glm CONFIG REQUIRED)
find_package(OpenGL MODULE REQUIRED)
find_package(SDL2 CONFIG REQUIRED)
find_package(sdl2-net CONFIG REQUIRED)
find_package(SDL2_net CONFIG REQUIRED)
find_package(imgui CONFIG REQUIRED)

file(GLOB_RECURSE SRC_FILES "include/*.*" "src/*.*")
Expand All @@ -32,7 +32,7 @@ target_link_libraries(${MODULE_NAME}

PRIVATE
SDL2::SDL2
SDL2::SDL2_net
SDL2_net::SDL2_net-static
imgui::imgui
GLEW::GLEW
glm::glm
Expand Down

0 comments on commit 768c0b5

Please sign in to comment.