Skip to content

Commit

Permalink
Merge branch 'main' into cure
Browse files Browse the repository at this point in the history
  • Loading branch information
Pospelove committed Nov 12, 2023
2 parents 9c139c5 + ecf5b53 commit 08c7a49
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 10 deletions.
4 changes: 4 additions & 0 deletions client-deps/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,8 @@ if(WIN32)
)

add_dependencies(client-deps skyrim-platform)
else()
add_custom_target(client-deps ALL SOURCES ${sources}
COMMAND ${CMAKE_COMMAND} -E echo "Building client-deps is disabled on non-Windows setups."
)
endif()
26 changes: 16 additions & 10 deletions skymp5-downloader/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,19 +1,25 @@
project(skymp5-downloader)

include(${CMAKE_SOURCE_DIR}/cmake/link_vcpkg_dependencies.cmake)
include(${CMAKE_SOURCE_DIR}/cmake/apply_default_settings.cmake)
if(WIN32)
include(${CMAKE_SOURCE_DIR}/cmake/link_vcpkg_dependencies.cmake)
include(${CMAKE_SOURCE_DIR}/cmake/apply_default_settings.cmake)

# Define source files
set(sources
# Define source files
set(sources
src/main.cpp
src/icon.ico
src/resource.rc
)
)

add_executable(${PROJECT_NAME} WIN32 ${sources})
set_property(TARGET ${PROJECT_NAME} APPEND PROPERTY LINK_FLAGS "/MANIFESTUAC:\"level='requireAdministrator' uiAccess='false'\"")
add_executable(${PROJECT_NAME} WIN32 ${sources})
set_property(TARGET ${PROJECT_NAME} APPEND PROPERTY LINK_FLAGS "/MANIFESTUAC:\"level='requireAdministrator' uiAccess='false'\"")

link_vcpkg_dependencies(TARGETS ${PROJECT_NAME})
apply_default_settings(TARGETS ${PROJECT_NAME})
link_vcpkg_dependencies(TARGETS ${PROJECT_NAME})
apply_default_settings(TARGETS ${PROJECT_NAME})

target_link_libraries(${PROJECT_NAME} PRIVATE ComCtl32)
target_link_libraries(${PROJECT_NAME} PRIVATE ComCtl32)
else()
add_custom_target(${PROJECT_NAME} ALL SOURCES ${sources}
COMMAND ${CMAKE_COMMAND} -E echo "Building ${PROJECT_NAME} is disabled on non-Windows setups."
)
endif()

0 comments on commit 08c7a49

Please sign in to comment.