Reorganize cmake folders
This commit is contained in:
parent
807cf7ba86
commit
174b50d1ba
5 changed files with 72 additions and 75 deletions
|
@ -7,9 +7,6 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake)
|
|||
# enable folders in IDEs that support this feature
|
||||
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
|
||||
|
||||
# enable lto
|
||||
set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
|
||||
|
||||
include(${CMAKE_CURRENT_LIST_DIR}/cmake/Common.cmake)
|
||||
include(${CMAKE_CURRENT_LIST_DIR}/cmake/AddPlatformExecutable.cmake)
|
||||
include(FetchContent)
|
||||
|
@ -21,61 +18,6 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
|
|||
set(ENABLE_LINUX TRUE)
|
||||
endif()
|
||||
|
||||
FetchContent_Declare(
|
||||
bullet
|
||||
GIT_REPOSITORY https://github.com/bulletphysics/bullet3.git
|
||||
GIT_TAG 2.89
|
||||
)
|
||||
|
||||
FetchContent_Declare(
|
||||
spirv-cross
|
||||
GIT_REPOSITORY https://github.com/KhronosGroup/SPIRV-Cross.git
|
||||
GIT_TAG 2020-05-19
|
||||
)
|
||||
|
||||
FetchContent_Declare(
|
||||
glslang
|
||||
GIT_REPOSITORY https://github.com/KhronosGroup/glslang.git
|
||||
GIT_TAG master
|
||||
)
|
||||
|
||||
# bullet
|
||||
set(BUILD_BULLET3 OFF CACHE BOOL "" FORCE)
|
||||
set(BUILD_BULLET3_DEMOS OFF CACHE BOOL "" FORCE)
|
||||
set(BUILD_BULLET2_DEMOS OFF CACHE BOOL "" FORCE)
|
||||
set(BUILD_CPU_DEMOS OFF CACHE BOOL "" FORCE)
|
||||
set(USE_GRAPHICAL_BENCHMARK OFF CACHE BOOL "" FORCE)
|
||||
set(BUILD_EXTRAS OFF CACHE BOOL "" FORCE)
|
||||
set(INSTALL_LIBS OFF CACHE BOOL "" FORCE)
|
||||
|
||||
# spirv-cross
|
||||
set(BUILD_UNIT_TESTS OFF CACHE BOOL "" FORCE)
|
||||
set(SPIRV_CROSS_SKIP_INSTALL ON CACHE BOOL "" FORCE)
|
||||
set(BUILD_EXTERNAL OFF CACHE BOOL "" FORCE)
|
||||
set(SPIRV_CROSS_CLI OFF CACHE BOOL "" FORCE)
|
||||
set(SPIRV_CROSS_ENABLE_TESTS OFF CACHE BOOL "" FORCE)
|
||||
set(SPIRV_CROSS_ENABLE_HLSL OFF CACHE BOOL "" FORCE)
|
||||
set(SPIRV_CROSS_ENABLE_CPP OFF CACHE BOOL "" FORCE)
|
||||
set(SPIRV_CROSS_ENABLE_REFLECT OFF CACHE BOOL "" FORCE)
|
||||
set(SPIRV_CROSS_ENABLE_C_API OFF CACHE BOOL "" FORCE)
|
||||
set(SPIRV_CROSS_ENABLE_UTIL OFF CACHE BOOL "" FORCE)
|
||||
|
||||
# glslang
|
||||
set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
|
||||
set(BUILD_EXTERNAL OFF CACHE BOOL "" FORCE)
|
||||
set(ENABLE_GLSLANG_BINARIES OFF CACHE BOOL "" FORCE)
|
||||
set(USE_MSVC_RUNTIME_LIBRARY_DLL ON CACHE BOOL "" FORCE)
|
||||
set(ENABLE_GLSLANG_INSTALL OFF CACHE BOOL "" FORCE)
|
||||
set(ENABLE_CTEST OFF CACHE BOOL "" FORCE)
|
||||
|
||||
set(CMAKE_FOLDER "External")
|
||||
|
||||
FetchContent_MakeAvailable(bullet)
|
||||
FetchContent_MakeAvailable(spirv-cross)
|
||||
FetchContent_MakeAvailable(glslang)
|
||||
|
||||
set(CMAKE_FOLDER "")
|
||||
|
||||
if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin" AND NOT IOS)
|
||||
message("macOS build detected!")
|
||||
|
||||
|
@ -124,24 +66,13 @@ set(CROSS_LIBS
|
|||
)
|
||||
|
||||
add_subdirectory(extern)
|
||||
|
||||
# enable lto
|
||||
set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
|
||||
|
||||
add_subdirectory(platforms)
|
||||
|
||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
||||
|
||||
add_subdirectory(engine)
|
||||
|
||||
set(CMAKE_FOLDER "Tools" PARENT_SCOPE)
|
||||
|
||||
if(NOT IOS AND NOT ENABLE_TVOS)
|
||||
add_subdirectory(tools/shadercompiler)
|
||||
endif()
|
||||
|
||||
if(BUILD_TOOLS)
|
||||
add_subdirectory(tools/common)
|
||||
add_subdirectory(tools/fontcompiler)
|
||||
add_subdirectory(tools/editor)
|
||||
add_subdirectory(tools/modelcompiler)
|
||||
add_subdirectory(tools/cutsceneeditor)
|
||||
endif()
|
||||
|
||||
set(CMAKE_FOLDER "" PARENT_SCOPE)
|
||||
add_subdirectory(tools)
|
|
@ -1,3 +1,5 @@
|
|||
set(CMAKE_FOLDER "Engine")
|
||||
|
||||
add_subdirectory(core)
|
||||
add_subdirectory(renderer)
|
||||
add_subdirectory(utility)
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
set(CMAKE_FOLDER "GFX Backends")
|
||||
set(CMAKE_FOLDER "${CMAKE_FOLDER}/GFX Backends")
|
||||
|
||||
add_library(GFX INTERFACE)
|
||||
target_include_directories(GFX INTERFACE public)
|
||||
|
|
51
extern/CMakeLists.txt
vendored
51
extern/CMakeLists.txt
vendored
|
@ -1,5 +1,56 @@
|
|||
set(CMAKE_FOLDER "External")
|
||||
|
||||
FetchContent_Declare(
|
||||
bullet
|
||||
GIT_REPOSITORY https://github.com/bulletphysics/bullet3.git
|
||||
GIT_TAG 2.89
|
||||
)
|
||||
|
||||
FetchContent_Declare(
|
||||
spirv-cross
|
||||
GIT_REPOSITORY https://github.com/KhronosGroup/SPIRV-Cross.git
|
||||
GIT_TAG 2020-05-19
|
||||
)
|
||||
|
||||
FetchContent_Declare(
|
||||
glslang
|
||||
GIT_REPOSITORY https://github.com/KhronosGroup/glslang.git
|
||||
GIT_TAG master
|
||||
)
|
||||
|
||||
# bullet
|
||||
set(BUILD_BULLET3 OFF CACHE BOOL "" FORCE)
|
||||
set(BUILD_BULLET3_DEMOS OFF CACHE BOOL "" FORCE)
|
||||
set(BUILD_BULLET2_DEMOS OFF CACHE BOOL "" FORCE)
|
||||
set(BUILD_CPU_DEMOS OFF CACHE BOOL "" FORCE)
|
||||
set(USE_GRAPHICAL_BENCHMARK OFF CACHE BOOL "" FORCE)
|
||||
set(BUILD_EXTRAS OFF CACHE BOOL "" FORCE)
|
||||
set(INSTALL_LIBS OFF CACHE BOOL "" FORCE)
|
||||
|
||||
# spirv-cross
|
||||
set(BUILD_UNIT_TESTS OFF CACHE BOOL "" FORCE)
|
||||
set(SPIRV_CROSS_SKIP_INSTALL ON CACHE BOOL "" FORCE)
|
||||
set(BUILD_EXTERNAL OFF CACHE BOOL "" FORCE)
|
||||
set(SPIRV_CROSS_CLI OFF CACHE BOOL "" FORCE)
|
||||
set(SPIRV_CROSS_ENABLE_TESTS OFF CACHE BOOL "" FORCE)
|
||||
set(SPIRV_CROSS_ENABLE_HLSL OFF CACHE BOOL "" FORCE)
|
||||
set(SPIRV_CROSS_ENABLE_CPP OFF CACHE BOOL "" FORCE)
|
||||
set(SPIRV_CROSS_ENABLE_REFLECT OFF CACHE BOOL "" FORCE)
|
||||
set(SPIRV_CROSS_ENABLE_C_API OFF CACHE BOOL "" FORCE)
|
||||
set(SPIRV_CROSS_ENABLE_UTIL OFF CACHE BOOL "" FORCE)
|
||||
|
||||
# glslang
|
||||
set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
|
||||
set(BUILD_EXTERNAL OFF CACHE BOOL "" FORCE)
|
||||
set(ENABLE_GLSLANG_BINARIES OFF CACHE BOOL "" FORCE)
|
||||
set(USE_MSVC_RUNTIME_LIBRARY_DLL ON CACHE BOOL "" FORCE)
|
||||
set(ENABLE_GLSLANG_INSTALL OFF CACHE BOOL "" FORCE)
|
||||
set(ENABLE_CTEST OFF CACHE BOOL "" FORCE)
|
||||
|
||||
FetchContent_MakeAvailable(bullet)
|
||||
FetchContent_MakeAvailable(spirv-cross)
|
||||
FetchContent_MakeAvailable(glslang)
|
||||
|
||||
if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
|
||||
|
||||
else()
|
||||
|
|
13
tools/CMakeLists.txt
Executable file
13
tools/CMakeLists.txt
Executable file
|
@ -0,0 +1,13 @@
|
|||
set(CMAKE_FOLDER "Tools")
|
||||
|
||||
if(NOT IOS AND NOT ENABLE_TVOS)
|
||||
add_subdirectory(shadercompiler)
|
||||
endif()
|
||||
|
||||
if(BUILD_TOOLS)
|
||||
add_subdirectory(common)
|
||||
add_subdirectory(fontcompiler)
|
||||
add_subdirectory(editor)
|
||||
add_subdirectory(modelcompiler)
|
||||
add_subdirectory(cutsceneeditor)
|
||||
endif()
|
Reference in a new issue