From 39210af3e59c929cba6de2d39ef1c32835f6388b Mon Sep 17 00:00:00 2001 From: Mikaƫl Capelle Date: Thu, 29 May 2025 11:04:36 +0200 Subject: Move to VCPKG (#2068) * Remove SConscript related files. * Force-load translations from uibase and gamebryo/creation. * Bring githubpp here and add a standalone preset. * Switch VersionInfo -> Version for ModOrganizer2. (#2063) * Add pre-commit hook. * Use 7zip build from VCPKG registry. * Use archive.dll from the bin folder instead of dlls. --- CMakeLists.txt | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index c1c1cf9b..85ba23f0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,16 +1,21 @@ cmake_minimum_required(VERSION 3.16) -# TODO: move these to cmake_common? -set(OPENSSL_USE_STATIC_LIBS FALSE CACHE STRING "" FORCE) -set(MySQL_INCLUDE_DIRS CACHE STRING "" FORCE) +# TODO: clean include directives +set(MO2_CMAKE_DEPRECATED_UIBASE_INCLUDE ON) -if(DEFINED DEPENDENCIES_DIR) - include(${DEPENDENCIES_DIR}/modorganizer_super/cmake_common/mo2.cmake) +project(organizer) + +# if MO2_INSTALL_IS_BIN is set, this means that we should install directly into the +# installation prefix, without the bin/ subfolder, typically for a standalone build +# to update an existing install +if (MO2_INSTALL_IS_BIN) + set(_bin ".") else() - include(${CMAKE_CURRENT_LIST_DIR}/../cmake_common/mo2.cmake) + set(_bin bin) endif() -project(organizer) add_subdirectory(src) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dump_running_process.bat DESTINATION bin) +set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT organizer) + +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dump_running_process.bat DESTINATION ${_bin}) -- cgit v1.3.1