fix cmake dependencies

Hugobros3 · Hugobros3 · commit 1ee34e785eec · 2024-04-07T14:20:20.000+02:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,6 +8,7 @@ find_package(Git)
 
 set(CMAKE_C_STANDARD 11)
 set(CMAKE_C_STANDARD_REQUIRED ON)
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 if (MSVC)
   add_compile_definitions(_CRT_SECURE_NO_WARNINGS)
diff --git a/src/driver/CMakeLists.txt b/src/driver/CMakeLists.txt
@@ -1,28 +1,32 @@
 add_library(driver driver.c cli.c)
-target_link_libraries(driver PUBLIC "$<BUILD_INTERFACE:shady>" shady_spirv shady_c shady_emit_common)
-set_property(TARGET driver PROPERTY POSITION_INDEPENDENT_CODE ON)
-
-add_executable(slim slim.c)
-target_link_libraries(slim PRIVATE driver)
-install(TARGETS slim EXPORT shady_export_set)
+target_link_libraries(driver PUBLIC "$<BUILD_INTERFACE:api>")
+target_link_libraries(driver PUBLIC "$<BUILD_INTERFACE:shady>")
+set_target_properties(driver PROPERTIES OUTPUT_NAME "shady_driver")
+install(TARGETS driver EXPORT shady_export_set)
 
 if (TARGET shady_s2s)
     target_compile_definitions(driver PUBLIC SPV_PARSER_PRESENT)
-    target_link_libraries(driver PRIVATE shady_s2s)
+    target_link_libraries(driver PUBLIC "$<BUILD_INTERFACE:shady_s2s>")
 endif()
 
 if (TARGET shady_fe_llvm)
-    target_link_libraries(driver PRIVATE shady_fe_llvm)
     target_compile_definitions(driver PUBLIC LLVM_PARSER_PRESENT)
+    target_link_libraries(driver PUBLIC "$<BUILD_INTERFACE:shady_fe_llvm>")
+endif ()
 
+add_executable(slim slim.c)
+target_link_libraries(slim PRIVATE driver)
+install(TARGETS slim EXPORT shady_export_set)
+
+if (TARGET shady_fe_llvm)
     add_executable(vcc vcc.c)
-    target_link_libraries(vcc PRIVATE driver api common)
+    target_link_libraries(vcc PRIVATE driver api)
     install(TARGETS vcc EXPORT shady_export_set)
 
     if (WIN32)
         add_custom_command(TARGET vcc POST_BUILD
-            COMMAND ${CMAKE_COMMAND} -E copy -t $<TARGET_FILE_DIR:vcc> $<TARGET_RUNTIME_DLLS:vcc>
-            COMMAND_EXPAND_LISTS
+                COMMAND ${CMAKE_COMMAND} -E copy -t $<TARGET_FILE_DIR:vcc> $<TARGET_RUNTIME_DLLS:vcc>
+                COMMAND_EXPAND_LISTS
         )
     endif ()
 endif ()
diff --git a/src/frontends/llvm/CMakeLists.txt b/src/frontends/llvm/CMakeLists.txt
@@ -19,4 +19,3 @@ message(FATAL_ERROR "Failed to find LLVM-C target, but found LLVM module earlier
 endif()
 
 target_link_libraries(shady_fe_llvm PRIVATE api common shady)
-set_property(TARGET shady_fe_llvm PROPERTY POSITION_INDEPENDENT_CODE ON)
diff --git a/src/frontends/slim/CMakeLists.txt b/src/frontends/slim/CMakeLists.txt
@@ -2,5 +2,4 @@ add_library(slim_parser STATIC parser.c token.c)
 target_link_libraries(slim_parser PUBLIC common api)
 target_include_directories(slim_parser PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>)
 target_include_directories(slim_parser INTERFACE "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../>")
-set_property(TARGET slim_parser PROPERTY POSITION_INDEPENDENT_CODE ON)
 target_link_libraries(shady PUBLIC "$<BUILD_INTERFACE:slim_parser>")
diff --git a/src/frontends/spirv/CMakeLists.txt b/src/frontends/spirv/CMakeLists.txt
@@ -1,4 +1,3 @@
 add_library(shady_s2s STATIC s2s.c)
-target_link_libraries(shady_s2s PRIVATE api common shady)
+target_link_libraries(shady_s2s PRIVATE api common)
 target_link_libraries(shady_s2s PRIVATE "$<BUILD_INTERFACE:SPIRV-Headers::SPIRV-Headers>")
-set_property(TARGET shady_s2s PROPERTY POSITION_INDEPENDENT_CODE ON)
diff --git a/src/runtime/CMakeLists.txt b/src/runtime/CMakeLists.txt
@@ -1,7 +1,5 @@
-add_library(runtime SHARED runtime.c runtime_program.c)
-target_link_libraries(runtime PUBLIC shady)
-target_link_libraries(runtime PUBLIC "$<BUILD_INTERFACE:driver>")
-set_property(TARGET runtime PROPERTY POSITION_INDEPENDENT_CODE ON)
+add_library(runtime runtime.c runtime_program.c)
+target_link_libraries(runtime PUBLIC driver)
 set_target_properties(runtime PROPERTIES OUTPUT_NAME "shady_runtime")
 
 add_subdirectory(vulkan)
diff --git a/src/runtime/cuda/CMakeLists.txt b/src/runtime/cuda/CMakeLists.txt
@@ -3,12 +3,11 @@ find_package(CUDAToolkit)
 if (CUDAToolkit_FOUND)
     message("Cuda toolkit found.")
     add_library(cuda_runtime STATIC cuda_runtime.c cuda_runtime_buffer.c cuda_runtime_program.c)
-    target_link_libraries(cuda_runtime PUBLIC api)
-    target_link_libraries(cuda_runtime PUBLIC shady)
+    target_link_libraries(cuda_runtime PRIVATE api)
     target_link_libraries(cuda_runtime PRIVATE "$<BUILD_INTERFACE:common>")
     target_link_libraries(cuda_runtime PRIVATE "$<BUILD_INTERFACE:murmur3>")
     target_link_libraries(cuda_runtime PRIVATE CUDA::cudart CUDA::cuda_driver CUDA::nvrtc)
-    set_property(TARGET cuda_runtime PROPERTY POSITION_INDEPENDENT_CODE ON)
+
     target_link_libraries(runtime PRIVATE cuda_runtime)
     target_compile_definitions(runtime PUBLIC CUDA_BACKEND_PRESENT=1)
 endif ()
diff --git a/src/runtime/vulkan/CMakeLists.txt b/src/runtime/vulkan/CMakeLists.txt
@@ -3,14 +3,13 @@ find_package(Vulkan)
 if (Vulkan_FOUND)
     message("Vulkan found")
     add_library(vk_runtime STATIC vk_runtime.c vk_runtime_device.c vk_runtime_program.c vk_runtime_dispatch.c vk_runtime_buffer.c)
-    target_link_libraries(vk_runtime PUBLIC api)
-    target_link_libraries(vk_runtime PUBLIC shady)
+    target_link_libraries(vk_runtime PRIVATE api)
     target_link_libraries(vk_runtime PRIVATE "$<BUILD_INTERFACE:common>")
     target_link_libraries(vk_runtime PRIVATE "$<BUILD_INTERFACE:murmur3>")
     target_link_libraries(vk_runtime PRIVATE Vulkan::Headers Vulkan::Vulkan)
-    set_property(TARGET vk_runtime PROPERTY POSITION_INDEPENDENT_CODE ON)
-    target_link_libraries(runtime PRIVATE vk_runtime)
+
     target_compile_definitions(runtime PUBLIC VK_BACKEND_PRESENT=1)
+    target_link_libraries(runtime PRIVATE "$<BUILD_INTERFACE:vk_runtime>")
 else()
     message("Vulkan not found, runtime component will not be built.")
 endif()
diff --git a/src/shady/CMakeLists.txt b/src/shady/CMakeLists.txt
@@ -96,9 +96,8 @@ set(SHADY_SOURCES
     passes/spirv_lift_globals_ssbo.c
 )
 
-add_library(shady OBJECT ${SHADY_SOURCES})
+add_library(shady ${SHADY_SOURCES})
 target_include_directories(shady PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>)
-set_property(TARGET shady PROPERTY POSITION_INDEPENDENT_CODE ON)
 
 if (WIN32)
     if (MSVC)
@@ -111,7 +110,7 @@ endif()
 add_subdirectory(internal)
 add_subdirectory(emit)
 
-target_link_libraries(shady PUBLIC "api")
-target_link_libraries(shady PUBLIC "$<BUILD_INTERFACE:common>")
+target_link_libraries(shady PRIVATE "api")
+target_link_libraries(shady INTERFACE "$<BUILD_INTERFACE:common>")
 target_link_libraries(shady PRIVATE "$<BUILD_INTERFACE:SPIRV-Headers::SPIRV-Headers>")
 target_link_libraries(shady PRIVATE "$<BUILD_INTERFACE:m>")
diff --git a/src/shady/emit/CMakeLists.txt b/src/shady/emit/CMakeLists.txt
@@ -4,6 +4,3 @@ add_subdirectory(c)
 add_library(shady_emit_common OBJECT
     common.c
 )
-
-target_link_libraries(shady PRIVATE "$<BUILD_INTERFACE:shady_spirv>")
-target_link_libraries(shady PRIVATE "$<BUILD_INTERFACE:shady_c>")
diff --git a/src/shady/emit/c/CMakeLists.txt b/src/shady/emit/c/CMakeLists.txt
@@ -1,17 +1,21 @@
-add_library(shady_c OBJECT
+add_library(shady_c STATIC
     emit_c.c
     emit_c_instructions.c
     emit_c_signatures.c
     emit_c_builtins.c
 )
 set_property(TARGET shady_c PROPERTY POSITION_INDEPENDENT_CODE ON)
 
-target_include_directories(shady_c PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>)
-target_link_libraries(shady_c PUBLIC "api")
+target_include_directories(shady_c PRIVATE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>)
+
+target_link_libraries(shady_c PRIVATE "api")
+target_link_libraries(shady_c INTERFACE "shady")
 target_link_libraries(shady_c PRIVATE "$<BUILD_INTERFACE:common>")
-target_link_libraries(shady_c PUBLIC "$<BUILD_INTERFACE:shady_generated>")
+target_link_libraries(shady_c PRIVATE "$<BUILD_INTERFACE:shady_generated>")
 
 embed_file(string shady_cuda_prelude_src cuda_prelude.cu)
 embed_file(string shady_cuda_builtins_src cuda_builtins.cu)
 target_link_libraries(shady_c PRIVATE "$<BUILD_INTERFACE:shady_cuda_prelude_src>")
-target_link_libraries(shady_c PRIVATE "$<BUILD_INTERFACE:shady_cuda_builtins_src>")
+target_link_libraries(shady_c PRIVATE "$<BUILD_INTERFACE:shady_cuda_builtins_src>")
+
+target_link_libraries(shady PUBLIC "$<BUILD_INTERFACE:shady_c>")
diff --git a/src/shady/emit/spirv/CMakeLists.txt b/src/shady/emit/spirv/CMakeLists.txt
@@ -1,13 +1,17 @@
-add_library(shady_spirv OBJECT
+add_library(shady_spirv STATIC
     emit_spv.c
     emit_spv_type.c
     emit_spv_instructions.c
     spirv_builder.c
 )
 set_property(TARGET shady_spirv PROPERTY POSITION_INDEPENDENT_CODE ON)
 
-target_include_directories(shady_spirv PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>)
-target_link_libraries(shady_spirv PUBLIC "api")
+target_include_directories(shady_spirv PRIVATE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>)
+
+target_link_libraries(shady_spirv PRIVATE "api")
+target_link_libraries(shady_spirv INTERFACE "shady")
 target_link_libraries(shady_spirv PRIVATE "$<BUILD_INTERFACE:common>")
 target_link_libraries(shady_spirv PRIVATE "$<BUILD_INTERFACE:SPIRV-Headers::SPIRV-Headers>")
-target_link_libraries(shady_spirv PUBLIC "$<BUILD_INTERFACE:shady_generated>")
+target_link_libraries(shady_spirv PRIVATE "$<BUILD_INTERFACE:shady_generated>")
+
+target_link_libraries(shady PUBLIC "$<BUILD_INTERFACE:shady_spirv>")

Original file line number	Diff line number	Diff line change
`@@ -19,4 +19,3 @@ message(FATAL_ERROR "Failed to find LLVM-C target, but found LLVM module earlier`
`19`	`19`	`endif()`
`20`	`20`
`21`	`21`	`target_link_libraries(shady_fe_llvm PRIVATE api common shady)`
`22`		`-set_property(TARGET shady_fe_llvm PROPERTY POSITION_INDEPENDENT_CODE ON)`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,3 @@ add_subdirectory(c)`
`4`	`4`	`add_library(shady_emit_common OBJECT`
`5`	`5`	`common.c`
`6`	`6`	`)`
`7`		`-`
`8`		`-target_link_libraries(shady PRIVATE "$<BUILD_INTERFACE:shady_spirv>")`
`9`		`-target_link_libraries(shady PRIVATE "$<BUILD_INTERFACE:shady_c>")`