Merge pull request #28 from ModOrganizer2/update-cmake-common-qt6

Update following cmake_common changes.
This commit is contained in:
Mikaël Capelle
2022-04-28 17:54:13 +02:00
committed by GitHub
2 changed files with 14 additions and 19 deletions
+4 -13
View File
@@ -1,22 +1,13 @@
cmake_minimum_required(VERSION 3.16)
project(bsa_packer)
set(project_type plugin)
set(enable_warnings OFF)
set(create_translations ON)
if(DEFINED DEPENDENCIES_DIR)
include(${DEPENDENCIES_DIR}/modorganizer_super/cmake_common/project.cmake)
include(${DEPENDENCIES_DIR}/modorganizer_super/cmake_common/mo2.cmake)
else()
include(../cmake_common/project.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/../cmake_common/mo2.cmake)
endif()
add_subdirectory(src)
target_include_directories(bsa_packer PRIVATE ${BOOST_DI_ROOT}/include)
target_link_directories(bsa_packer PRIVATE lib)
target_link_libraries(bsa_packer DirectXTex)
requires_library(libbsarch)
target_compile_definitions(bsa_packer PRIVATE BSAPACKER_LIBRARY)
project(bsa_packer)
add_subdirectory(src)
if(BUILD_TESTING)
add_subdirectory(tests)
+10 -6
View File
@@ -1,9 +1,13 @@
cmake_minimum_required(VERSION 3.16)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
add_library(bsa_packer SHARED)
mo2_configure_plugin(bsa_packer WARNINGS OFF
PRIVATE_DEPENDS boost libbsarch Qt::Concurrent)
if(DEFINED DEPENDENCIES_DIR)
include(${DEPENDENCIES_DIR}/modorganizer_super/cmake_common/src.cmake)
else()
include(../../cmake_common/src.cmake)
endif()
target_include_directories(bsa_packer
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${BOOST_DI_ROOT}/include)
target_compile_definitions(bsa_packer PRIVATE BSAPACKER_LIBRARY)
target_link_libraries(bsa_packer
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../lib/DirectXTex.lib)
mo2_install_target(bsa_packer)