minetest/irrlicht
1
0
Fork 0
mirror of https://github.com/minetest/irrlicht.git synced 2025-04-20 02:50:19 +02:00
Code Issues Projects Releases Wiki Activity

Fix indentation style in CMakeLists

Browse Source
This commit is contained in:
JosiahWI 2023-05-15 12:32:45 -05:00
parent 004b91358e
commit a1e4c88246
No known key found for this signature in database
GPG Key ID: C7BB8573A4ABC4B9
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -13,7 +13,7 @@ set(IRRLICHTMT_REVISION 11)
# https://gitlab.kitware.com/cmake/cmake/-/merge_requests/487 # https://gitlab.kitware.com/cmake/cmake/-/merge_requests/487
project(Irrlicht project(Irrlicht
VERSION 1.9.0.${IRRLICHTMT_REVISION} VERSION 1.9.0.${IRRLICHTMT_REVISION}
LANGUAGES C CXX LANGUAGES C CXX
) )
message(STATUS "*** Building IrrlichtMt ${PROJECT_VERSION} ***") message(STATUS "*** Building IrrlichtMt ${PROJECT_VERSION} ***")
@ -40,7 +40,7 @@ if(NOT CMAKE_BUILD_TYPE)
endif() endif()
if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
include(CTest) include(CTest)
endif() endif()
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")

14
source/Irrlicht/CMakeLists.txt
View File

@ -308,7 +308,7 @@ set(link_libs
"${ZLIB_LIBRARY}" "${ZLIB_LIBRARY}"
"${JPEG_LIBRARY}" "${JPEG_LIBRARY}"
"${PNG_LIBRARY}" "${PNG_LIBRARY}"
tinygltf::tinygltf tinygltf::tinygltf
"$<$<BOOL:${USE_SDL2}>:${SDL2_LIBRARIES}>" "$<$<BOOL:${USE_SDL2}>:${SDL2_LIBRARIES}>"
${OPENGL_LIBRARIES} ${OPENGL_LIBRARIES}
@ -331,7 +331,7 @@ set(IRRMESHLOADER
CB3DMeshFileLoader.cpp CB3DMeshFileLoader.cpp
COBJMeshFileLoader.cpp COBJMeshFileLoader.cpp
CXMeshFileLoader.cpp CXMeshFileLoader.cpp
CGLTFMeshFileLoader.cpp CGLTFMeshFileLoader.cpp
) )
add_library(IRRMESHOBJ OBJECT add_library(IRRMESHOBJ OBJECT
@ -343,13 +343,13 @@ add_library(IRRMESHOBJ OBJECT
) )
get_property(tinygltf_INCLUDE_DIRS get_property(tinygltf_INCLUDE_DIRS
TARGET tinygltf::tinygltf TARGET tinygltf::tinygltf
PROPERTY INTERFACE_INCLUDE_DIRECTORIES PROPERTY INTERFACE_INCLUDE_DIRECTORIES
) )
get_property(tinygltf_COMPILE_DEFS get_property(tinygltf_COMPILE_DEFS
TARGET tinygltf::tinygltf TARGET tinygltf::tinygltf
PROPERTY INTERFACE_COMPILE_DEFINITIONS PROPERTY INTERFACE_COMPILE_DEFINITIONS
) )
target_include_directories(IRRMESHOBJ PRIVATE ${tinygltf_INCLUDE_DIRS}) target_include_directories(IRRMESHOBJ PRIVATE ${tinygltf_INCLUDE_DIRS})
@ -564,7 +564,7 @@ else()
endif() endif()
if ((CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) AND BUILD_TESTING) if ((CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) AND BUILD_TESTING)
add_subdirectory(tests) add_subdirectory(tests)
endif() endif()
install(TARGETS ${INSTALL_TARGETS} install(TARGETS ${INSTALL_TARGETS}

6
source/Irrlicht/tests/CMakeLists.txt
View File

@ -20,7 +20,7 @@ target_link_libraries(tests
) )
add_test( add_test(
NAME tests NAME tests
COMMAND "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/tests" COMMAND "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/tests"
WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}" WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
) )