rejig cmake build files

Author: Hugobros3

CMakeLists.txt

@@ -10,6 +10,8 @@ set(CMAKE_C_STANDARD 11)
 set(CMAKE_C_STANDARD_REQUIRED ON)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
+option(BUILD_SHARED_LIBS "Build using shared libraries" ON)
+
 if (MSVC)
   add_compile_definitions(_CRT_SECURE_NO_WARNINGS)
 endif()
@@ -99,20 +101,11 @@ endif()
 
 include(CMakePackageConfigHelpers)
 
-install(TARGETS api EXPORT shady_export_set)
-install(TARGETS shady EXPORT shady_export_set ARCHIVE DESTINATION ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY})
-
 if (TARGET vcc)
   add_subdirectory(vcc-std)
 endif ()
 
-if (TARGET runtime)
-  install(TARGETS runtime EXPORT shady_export_set ARCHIVE DESTINATION ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY})
-endif()
-
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/shady DESTINATION include)
 install(EXPORT shady_export_set DESTINATION share/cmake/shady/ NAMESPACE shady:: FILE shady-targets.cmake)
 
 configure_file(cmake/shady-config.cmake.in shady-config.cmake @ONLY)
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/shady-config.cmake" DESTINATION share/cmake/shady)
-#install(FILES "${CMAKE_CURRENT_BINARY_DIR}/shady-config.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/shady)

src/common/CMakeLists.txt

@@ -1,8 +1,16 @@
 add_library(common STATIC list.c dict.c log.c portability.c util.c growy.c arena.c printer.c)
-target_include_directories(common INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
 target_link_libraries(common PRIVATE "$<BUILD_INTERFACE:murmur3>")
 set_property(TARGET common PROPERTY POSITION_INDEPENDENT_CODE ON)
 
+# We need to export 'common' because otherwise when using static libraries we will not be able to resolve those symbols
+install(TARGETS common EXPORT shady_export_set)
+
+# But we don't want projects outside this to be able to see these APIs and call into them
+# (Also we couldn't since the header files live with the source anyways)
+add_library(common_api INTERFACE)
+target_include_directories(common_api INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
+target_link_libraries(common INTERFACE "$<BUILD_INTERFACE:common_api>")
+
 add_executable(embedder embed.c)
 
 function(embed_file TYPE NAME SRC)
@@ -14,3 +22,4 @@ function(embed_file TYPE NAME SRC)
 	add_dependencies(${NAME} "${NAME}_h")
     target_include_directories(${NAME} INTERFACE ${CMAKE_CURRENT_BINARY_DIR})
 endfunction()
+

src/driver/CMakeLists.txt

@@ -1,6 +1,6 @@
 add_library(driver driver.c cli.c)
-target_link_libraries(driver PUBLIC "$<BUILD_INTERFACE:api>")
-target_link_libraries(driver PUBLIC "$<BUILD_INTERFACE:shady>")
+target_link_libraries(driver PUBLIC "api")
+target_link_libraries(driver PUBLIC "shady")
 set_target_properties(driver PROPERTIES OUTPUT_NAME "shady_driver")
 install(TARGETS driver EXPORT shady_export_set)
 

src/runtime/CMakeLists.txt

@@ -7,3 +7,5 @@ add_subdirectory(cuda)
 
 add_executable(runtime_test runtime_test.c)
 target_link_libraries(runtime_test runtime)
+
+install(TARGETS runtime EXPORT shady_export_set ARCHIVE DESTINATION ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY})

src/shady/CMakeLists.txt

@@ -111,6 +111,8 @@ add_subdirectory(internal)
 add_subdirectory(emit)
 
 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 INTERFACE "common")
 target_link_libraries(shady PRIVATE "$<BUILD_INTERFACE:m>")
+
+install(DIRECTORY ${CMAKE_SOURCE_DIR}/include/shady DESTINATION include)
+install(TARGETS shady EXPORT shady_export_set ARCHIVE DESTINATION ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY})

src/shady/api/CMakeLists.txt

@@ -11,3 +11,4 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/grammar_generated.h DESTINATION includ
 add_generated_file(FILE_NAME primops_generated.h TARGET_NAME generate-primops-headers SOURCES generator_primops.c)
 add_dependencies(api INTERFACE generate-primops-headers)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/primops_generated.h DESTINATION include)
+install(TARGETS api EXPORT shady_export_set)