light7734/light
light7734/light
1
1
Fork 0
Code Issues 20 Pull requests 1 Projects 1 Releases Packages Wiki Activity

Fixed CMake issues on linux, compile to test.

Browse source
This commit is contained in:
Steve Gremory 2021-09-20 12:13:03 +05:30
parent d7c75a2b04
commit dc3650e118
6 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -2,6 +2,7 @@
.vs/
bin/
bin-obj/
build/
# VS Files
**.vcxproj**
@ -25,4 +26,4 @@ Makefile
**.ini
!**/default_gui_layout.ini
CMake/
CMake/

6
CMakeLists.txt
View file

@ -1,7 +1,9 @@
cmake_minimum_required(VERSION 3.21.2)
cmake_minimum_required(VERSION 3.14)
project(Light VERSION 1.0.0)
set(SPIRV_CROSS_ENABLE_TESTS OFF)
add_subdirectory(Dependencies/ShaderConductor) # <-- this project should not use "cxx_standard 17"
# directories
@ -42,4 +44,4 @@ target_link_libraries(Mirror Engine)
if(MSVC)
set_property(DIRECTORY ${CMAE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT Mirror)
endif()
endif()

4
Dependencies/GLAD/CMakeLists.txt vendored
View file

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.21.2)
cmake_minimum_required(VERSION 3.14)
if (CMAKE_COMPILER_IS_GNUCC)
add_compile_options(-w)
@ -15,4 +15,4 @@ file(GLOB_RECURSE GLAD_HEADERS true ABSOLUTE ${CMAKE_CURRENT_SOURCE_DIR}/include
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/)
add_library(glad STATIC ${GLAD_SOURCES} ${GLAD_HEADERS})
add_library(glad STATIC ${GLAD_SOURCES} ${GLAD_HEADERS})

4
Dependencies/stb_image/CMakeLists.txt vendored
View file

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.21.2)
cmake_minimum_required(VERSION 3.14)
if (CMAKE_COMPILER_IS_GNUCC)
add_compile_options(-w)
@ -10,4 +10,4 @@ endif()
file(GLOB STB_IMAGES_FILES true ABSOLUTE ${CMAKE_CURRENT_SOURCE_DIR}/*)
add_library(stb_image STATIC ${STB_IMAGES_FILES})
add_library(stb_image STATIC ${STB_IMAGES_FILES})

4
Engine/CMakeLists.txt
View file

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.21.2)
cmake_minimum_required(VERSION 3.14)
if (CMAKE_COMPILER_IS_GNUCC)
add_compile_options(-w)
@ -66,4 +66,4 @@ add_custom_command(
TARGET Engine
POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different
${CMAKE_BINARY_DIR}/Dependencies/ShaderConductor/Bin/Debug/ShaderConductor.dll
${CMAKE_BINARY_DIR}/bin/Debug)
${CMAKE_BINARY_DIR}/bin/Debug)

4
Mirror/CMakeLists.txt
View file

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.21.2)
cmake_minimum_required(VERSION 3.14)
if (CMAKE_COMPILER_IS_GNUCC)
add_compile_options(-w)
@ -26,4 +26,4 @@ ${DEPENDENCIES_DIR}stb_image/
file(GLOB_RECURSE MIRROR_FILES true ABSOLUTE ${CMAKE_CURRENT_SOURCE_DIR}/src/* ${CMAKE_CURRENT_SOURCE_DIR}/res/*)
source_group(TREE ${MIRROR_DIR} FILES ${MIRROR_FILES})
add_executable(Mirror ${MIRROR_FILES})
add_executable(Mirror ${MIRROR_FILES})