Add support for building with a different Qt

This commit is contained in:
Gary Talent 2018-02-06 19:20:07 -06:00
parent e7a396655c
commit 2141b12b29
2 changed files with 12 additions and 1 deletions

View File

@ -4,6 +4,9 @@ project(nostalgia)
set(NOSTALGIA_BUILD_TYPE "Native" CACHE STRING "The type of build to produce(Native/GBA)")
set(NOSTALGIA_IDE_BUILD "ON" CACHE STRING "Build for IDE's to run")
set(NOSTALGIA_QT_PATH "" CACHE STRING "Path to Qt Libraries")
set(CMAKE_PREFIX_PATH ${NOSTALGIA_QT_PATH})
list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules)
include(address_sanitizer)
@ -22,7 +25,7 @@ endif()
add_definitions(
-std=c++14
#-fdiagnostics-color
#-fdiagnostics-color # forces colored output when using ninja
-Wall
-Wsign-compare
)
@ -42,6 +45,9 @@ if(APPLE)
set(NOSTALGIA_DIST_MAC_APP_CONTENTS Nostalgia.app/Contents)
else()
set(CMAKE_INSTALL_RPATH "$ORIGIN" "$ORIGIN/../lib/nostalgia")
if(NOT ${NOSTALGIA_QT_PATH} STREQUAL "")
set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH} "${NOSTALGIA_QT_PATH}/lib")
endif()
set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
set(NOSTALGIA_DIST_BIN bin)
set(NOSTALGIA_DIST_LIB lib)

View File

@ -21,6 +21,10 @@ if (${buildType} -eq "asan") {
$buildTypeArgs="-DCMAKE_BUILD_TYPE=Release"
}
if (${env:NOSTALGIA_QT_PATH} -ne "") {
$qtPath="-DNOSTALGIA_QT_PATH=${env:NOSTALGIA_QT_PATH}"
}
$buildDir="${project}/build/${target}-${buildType}"
$distDir="${project}/dist/${target}-${buildType}"
@ -32,6 +36,7 @@ cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON `
-DNOSTALGIA_IDE_BUILD=OFF `
$buildTool `
$buildTypeArgs `
$qtPath `
$toolchain `
$project
Pop-Location