R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixup hardcoded thirdparty directories in CMake files

Browse Source 
Should be obtained from the 'THIRDPARTY_SOURCE_DIR' variable.
This commit is contained in:
Kawe Mazidjatari 2023-10-07 16:26:56 +02:00
parent 858cbaa9a2
commit 869aff3ce2
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -14,7 +14,7 @@ apply_project_settings()
include_directories( "${ENGINE_SOURCE_DIR}" ) include_directories( "${ENGINE_SOURCE_DIR}" )
include_directories( "${ENGINE_SOURCE_DIR}/public" ) include_directories( "${ENGINE_SOURCE_DIR}/public" )
include_directories( "${ENGINE_SOURCE_DIR}/thirdparty" ) include_directories( "${THIRDPARTY_SOURCE_DIR}" )
# Include the subdirectories that contain the individual projects # Include the subdirectories that contain the individual projects
add_subdirectory( "${ENGINE_SOURCE_DIR}" ) add_subdirectory( "${ENGINE_SOURCE_DIR}" )

4
src/cmake/Macros.cmake
View File

@ -134,18 +134,22 @@ endmacro()
macro( thirdparty_suppress_warnings ) macro( thirdparty_suppress_warnings )
if( MSVC OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" ) if( MSVC OR CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
target_compile_options( ${PROJECT_NAME} PRIVATE target_compile_options( ${PROJECT_NAME} PRIVATE
/wd4057 # 'function': 'int *' differs in indirection to slightly different base types from 'unsigned int [4]'
/wd4100 # Unreferenced formal parameter. /wd4100 # Unreferenced formal parameter.
/wd4131 # Using old-style declarations /wd4131 # Using old-style declarations
/wd4152 # Function/data pointer conversion in expression. /wd4152 # Function/data pointer conversion in expression.
/wd4200 # Zero-sized array in union; SDL2 uses this for compiler compatibility. /wd4200 # Zero-sized array in union; SDL2 uses this for compiler compatibility.
/wd4201 # Nameless struct/union. /wd4201 # Nameless struct/union.
/wd4244 # Type conversion truncation; protobuf has many, but this appears intentional. /wd4244 # Type conversion truncation; protobuf has many, but this appears intentional.
/wd4245 # 'return': conversion signed/unsigned mismatch
/wd4267 # Type conversion truncation; protobuf has many, but this appears intentional. /wd4267 # Type conversion truncation; protobuf has many, but this appears intentional.
/wd4307 # Integral constant overflow. /wd4307 # Integral constant overflow.
/wd4389 # Signed/unsigned mismatch. /wd4389 # Signed/unsigned mismatch.
/wd4456 # Declaration hides previous local declaration. /wd4456 # Declaration hides previous local declaration.
/wd4457 # Declaration hides function parameter. /wd4457 # Declaration hides function parameter.
/wd4505 # Unreferenced local function has been removed. /wd4505 # Unreferenced local function has been removed.
/wd4701 # potentially uninitialized local variable.
/wd4702 # Unreachable code.
) )
endif() endif()
warnings_as_errors( ${PROJECT_NAME} FALSE ) warnings_as_errors( ${PROJECT_NAME} FALSE )

6
src/cmake/Options.cmake
View File

@ -103,9 +103,9 @@ macro( apply_project_settings )
include_directories( include_directories(
"${ENGINE_SOURCE_DIR}/" "${ENGINE_SOURCE_DIR}/"
"${ENGINE_SOURCE_DIR}/public/" "${ENGINE_SOURCE_DIR}/public/"
"${ENGINE_SOURCE_DIR}/thirdparty/" "${THIRDPARTY_SOURCE_DIR}/"
"${ENGINE_SOURCE_DIR}/thirdparty/imgui/" "${THIRDPARTY_SOURCE_DIR}/imgui/"
"${ENGINE_SOURCE_DIR}/thirdparty/recast/" "${THIRDPARTY_SOURCE_DIR}/recast/"
) )
endmacro() endmacro()