diff options
Diffstat (limited to 'overlay/CMakeLists.txt')
| -rw-r--r-- | overlay/CMakeLists.txt | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/overlay/CMakeLists.txt b/overlay/CMakeLists.txt index 45fa96a75..62b2ab1ba 100644 --- a/overlay/CMakeLists.txt +++ b/overlay/CMakeLists.txt @@ -14,7 +14,7 @@ if(BUILD_OVERLAY_XCOMPILE) LANGUAGES CXX ) - include("${PARENT_SOURCE_DIR}/cmake/compiler.cmake") + include("${MUMBLE_SOURCE_ROOT}/cmake/compiler.cmake") endif() set(DX11_PIXEL_SHADERS "overlay11.ps") @@ -118,7 +118,7 @@ if(BUILD_OVERLAY_XCOMPILE) target_include_directories(overlay PRIVATE ${Boost_INCLUDE_DIRS} - ${PARENT_SOURCE_DIR} + ${MUMBLE_SOURCE_ROOT} ${CMAKE_CURRENT_BINARY_DIR} ) else() @@ -156,8 +156,7 @@ if(64_BIT AND MSVC) CMAKE_GENERATOR ${CMAKE_GENERATOR} CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} "-DVCPKG_TARGET_TRIPLET=x86-windows-static-md" - "-DPARENT_SOURCE_DIR=${CMAKE_SOURCE_DIR}" - "-DMUMBLE_SOURCE_DIR=${CMAKE_SOURCE_DIR}/src/mumble" + "-DMUMBLE_SOURCE_ROOT=${CMAKE_SOURCE_DIR}" "-DMUMBLE_BINARY_DIR=${CMAKE_BINARY_DIR}" "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}" # Force MSVC, because CMake prioritizes MinGW over it. @@ -179,8 +178,7 @@ if(64_BIT AND MSVC) -G ${CMAKE_GENERATOR} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} "-DVCPKG_TARGET_TRIPLET=x86-windows-static-md" - "-DPARENT_SOURCE_DIR=${CMAKE_SOURCE_DIR}" - "-DMUMBLE_SOURCE_DIR=${CMAKE_SOURCE_DIR}/src/mumble" + "-DMUMBLE_SOURCE_ROOT=${CMAKE_SOURCE_DIR}" "-DMUMBLE_BINARY_DIR=${CMAKE_BINARY_DIR}" "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}" # Force MSVC, because CMake prioritizes MinGW over it. |