Skip to content
Snippets Groups Projects
Unverified Commit 65215d48 authored by Jacki's avatar Jacki
Browse files

Adjust cmake to find programs


Signed-off-by: default avatarJacki <jacki@thejackimonster.de>
parent 7be6dd85
No related branches found
No related tags found
No related merge requests found
...@@ -44,13 +44,16 @@ if (CMAKE_BUILD_TYPE) ...@@ -44,13 +44,16 @@ if (CMAKE_BUILD_TYPE)
set(vkcv_build_${_vkcv_build_type} 1) set(vkcv_build_${_vkcv_build_type} 1)
endif() endif()
if (EXISTS "/usr/bin/mold") find_program(mold_program "mold")
set(CMAKE_LINKER "/usr/bin/mold")
if (EXISTS ${mold_program})
set(CMAKE_LINKER ${mold_program})
endif() endif()
message(STATUS "Language: [ C++ " ${CMAKE_CXX_STANDARD} " ]") message(STATUS "Language: [ C++ " ${CMAKE_CXX_STANDARD} " ]")
message(STATUS "Compiler: [ " ${CMAKE_CXX_COMPILER_ID} " " ${CMAKE_CXX_COMPILER_VERSION} " ]") message(STATUS "Generator: [ " ${CMAKE_GENERATOR} " ]")
message(STATUS "Linker: [ " ${CMAKE_LINKER} " ]") message(STATUS "Compiler: [ " ${CMAKE_CXX_COMPILER_ID} " " ${CMAKE_CXX_COMPILER_VERSION} " ]")
message(STATUS "Linker: [ " ${CMAKE_LINKER} " ]")
if ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "9.0.0")) if ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "9.0.0"))
message(FATAL_ERROR "Upgrade your compiler! GCC 9.0+ is required!") message(FATAL_ERROR "Upgrade your compiler! GCC 9.0+ is required!")
......
if (EXISTS "/usr/bin/clang-format") find_program(clang_format_program "clang-format")
if (EXISTS ${clang_format_program})
# note the option ALL which allows to format the source together with the application # note the option ALL which allows to format the source together with the application
add_custom_target( clang_format ALL add_custom_target( clang_format ALL
COMMAND /usr/bin/clang-format -style=file --sort-includes -i ${vkcv_sources} COMMAND ${clang_format_program} -style=file --sort-includes -i ${vkcv_sources}
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
COMMENT "Formatting code with Clang-Format" COMMENT "Formatting code with Clang-Format"
VERBATIM ) VERBATIM )
......
...@@ -38,7 +38,7 @@ function(include_shader shader include_dir source_dir) ...@@ -38,7 +38,7 @@ function(include_shader shader include_dir source_dir)
add_custom_command( add_custom_command(
OUTPUT ${source_target_file} OUTPUT ${source_target_file}
WORKING_DIRECTORY "${shader_directory}" WORKING_DIRECTORY "${shader_directory}"
COMMAND xxd -i -C "${filename}" "${source_target_file}" COMMAND ${xxd_program} -i -C "${filename}" "${source_target_file}"
COMMENT "Processing shader into source files: ${shader}" COMMENT "Processing shader into source files: ${shader}"
) )
else() else()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment