-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Minor cleaning of CMakeLists.txt. Fix C++ warnings and Qt deprecation. * Avoid using Python from virtual environment.
- Loading branch information
Showing
45 changed files
with
536 additions
and
231 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,73 @@ | ||
{ | ||
"configurePresets": [ | ||
{ | ||
"errors": { | ||
"deprecated": true | ||
}, | ||
"hidden": true, | ||
"name": "cmake-dev", | ||
"warnings": { | ||
"deprecated": true, | ||
"dev": true | ||
} | ||
}, | ||
{ | ||
"cacheVariables": { | ||
"VCPKG_MANIFEST_NO_DEFAULT_FEATURES": { | ||
"type": "BOOL", | ||
"value": "ON" | ||
} | ||
}, | ||
"toolchainFile": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake", | ||
"hidden": true, | ||
"name": "vcpkg" | ||
}, | ||
{ | ||
"cacheVariables": { | ||
"VCPKG_MANIFEST_FEATURES": { | ||
"type": "STRING", | ||
"value": "testing" | ||
} | ||
}, | ||
"hidden": true, | ||
"inherits": ["vcpkg"], | ||
"name": "vcpkg-dev" | ||
}, | ||
{ | ||
"binaryDir": "${sourceDir}/vsbuild", | ||
"architecture": { | ||
"strategy": "set", | ||
"value": "x64" | ||
}, | ||
"cacheVariables": { | ||
"CMAKE_CXX_FLAGS": "/EHsc /MP /W4", | ||
"VCPKG_TARGET_TRIPLET": { | ||
"type": "STRING", | ||
"value": "x64-windows-static-md" | ||
} | ||
}, | ||
"generator": "Visual Studio 17 2022", | ||
"inherits": ["cmake-dev", "vcpkg-dev"], | ||
"name": "vs2022-windows", | ||
"toolset": "v143" | ||
}, | ||
{ | ||
"cacheVariables": { | ||
"VCPKG_MANIFEST_FEATURES": { | ||
"type": "STRING", | ||
"value": "standalone;testing" | ||
} | ||
}, | ||
"inherits": "vs2022-windows", | ||
"name": "vs2022-windows-standalone" | ||
} | ||
], | ||
"buildPresets": [ | ||
{ | ||
"name": "vs2022-windows", | ||
"resolvePackageReferences": "on", | ||
"configurePreset": "vs2022-windows" | ||
} | ||
], | ||
"version": 4 | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,38 @@ | ||
cmake_minimum_required(VERSION 3.16) | ||
|
||
find_package(Qt6 COMPONENTS Core) | ||
find_package(mo2-uibase CONFIG REQUIRED) | ||
|
||
pybind11_add_module(mobase MODULE) | ||
mo2_configure_library(mobase | ||
SOURCE_TREE | ||
mo2_default_source_group() | ||
mo2_configure_target(mobase | ||
NO_SOURCES | ||
WARNINGS 4 | ||
EXTERNAL_WARNINGS 4 | ||
AUTOMOC ON | ||
TRANSLATIONS OFF | ||
PRIVATE_DEPENDS uibase Qt::Core | ||
) | ||
target_link_libraries(mobase PRIVATE pybind11::qt pybind11::utils) | ||
mo2_target_sources(mobase | ||
FOLDER src | ||
PRIVATE | ||
deprecation.cpp | ||
deprecation.h | ||
mobase.cpp | ||
pybind11_all.h | ||
) | ||
mo2_target_sources(mobase | ||
FOLDER src/wrappers | ||
PRIVATE | ||
./wrappers/basic_classes.cpp | ||
./wrappers/game_features.cpp | ||
./wrappers/known_folders.h | ||
./wrappers/pyfiletree.cpp | ||
./wrappers/pyfiletree.h | ||
./wrappers/pyplugins.cpp | ||
./wrappers/pyplugins.h | ||
./wrappers/utils.cpp | ||
./wrappers/widgets.cpp | ||
./wrappers/wrappers.cpp | ||
./wrappers/wrappers.h | ||
) | ||
target_link_libraries(mobase PRIVATE pybind11::qt pybind11::utils mo2::uibase Qt6::Core) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,7 +7,7 @@ | |
|
||
#include <QCoreApplication> | ||
|
||
#include "log.h" | ||
#include <uibase/log.h> | ||
|
||
namespace py = pybind11; | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.