Skip to content
This repository has been archived by the owner on Apr 8, 2024. It is now read-only.

Commit

Permalink
Moved hack to global cmakelists
Browse files Browse the repository at this point in the history
  • Loading branch information
pigmej committed Dec 7, 2022
1 parent bf96c0a commit 653955b
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 7 deletions.
3 changes: 3 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ endif ()

if (APPLE)
option(SPACEMESHCUDA "Build with CUDA support" OFF)

# we should check here for ARM / Intel too
add_compile_definitions(SPACEMESH_VULKAN_COMPATIBILITY_NEEDED=1)
else()
option(SPACEMESHCUDA "Build with CUDA support" ON)
endif()
Expand Down
5 changes: 0 additions & 5 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,6 @@ else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
endif()

if (APPLE)
# we should check here for ARM / Intel too
add_compile_definitions(SPACEMESH_VULKAN_COMPATIBILITY_NEEDED=1)
endif()

include_directories(.)
include_directories(../include)

Expand Down
2 changes: 0 additions & 2 deletions src/vulkan/gen/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@ add_executable(shaders-gen ${SOURCES})
if(WIN32)
target_link_libraries(shaders-gen "$ENV{VULKAN_SDK}/Lib/vulkan-1.lib" "$ENV{VULKAN_SDK}/Lib/shaderc_combined.lib")
elseif(APPLE)
# we should check for M1 vs Intel here too
add_compile_definitions(SPACEMESH_VULKAN_COMPATIBILITY_NEEDED=1)
target_link_libraries(shaders-gen -L$ENV{VULKAN_SDK}/lib -lvulkan shaderc_combined)
elseif(UNIX)
if (SPACEMESH_ARCH_ARM64)
Expand Down

0 comments on commit 653955b

Please sign in to comment.