mirror of
https://github.com/MultiMC/MultiMC5.git
synced 2024-12-26 00:15:16 +00:00
NOISSUE revert to dumping all build artifacts to the root
This fixes unit tests on Windows... Windows has no mechanism to set library lookup path.
This commit is contained in:
parent
80b28e7d49
commit
b0bfffcd90
@ -17,9 +17,13 @@ enable_testing()
|
||||
set(CMAKE_AUTOMOC ON)
|
||||
set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
||||
|
||||
######## Set module path ########
|
||||
set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/")
|
||||
|
||||
# Output all executables and shared libs in the main build folder, not in subfolders.
|
||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
|
||||
if(UNIX)
|
||||
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
|
||||
endif()
|
||||
set(CMAKE_JAVA_TARGET_OUTPUT_DIR ${PROJECT_BINARY_DIR}/jars)
|
||||
|
||||
######## Set compiler flags ########
|
||||
|
@ -12,7 +12,7 @@ using namespace GoUpdate;
|
||||
|
||||
FileSourceList encodeBaseFile(const char *suffix)
|
||||
{
|
||||
auto base = qApp->applicationDirPath();
|
||||
auto base = QDir::currentPath();
|
||||
QUrl localFile = QUrl::fromLocalFile(base + suffix);
|
||||
QString localUrlString = localFile.toString(QUrl::FullyEncoded);
|
||||
auto item = FileSource("http", localUrlString);
|
||||
@ -179,7 +179,7 @@ slots:
|
||||
|
||||
OperationList operations;
|
||||
|
||||
processFileLists(currentVersion, newVersion, QCoreApplication::applicationDirPath(), tempFolder, new NetJob("Dummy"), operations);
|
||||
processFileLists(currentVersion, newVersion, QDir::currentPath(), tempFolder, new NetJob("Dummy"), operations);
|
||||
qDebug() << (operations == expectedOperations);
|
||||
qDebug() << operations;
|
||||
qDebug() << expectedOperations;
|
||||
|
@ -45,5 +45,5 @@ function(add_unit_test name)
|
||||
|
||||
target_include_directories(${name}_test PRIVATE "${TEST_RESOURCE_PATH}/UnitTest/")
|
||||
|
||||
add_test(NAME ${name} COMMAND ${name}_test)
|
||||
add_test(NAME ${name} COMMAND ${name}_test WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
|
||||
endfunction()
|
||||
|
Loading…
Reference in New Issue
Block a user