Commit 47d09cbd by Antonio Maiorano

CMake: make root compile options and link libraries private

Should have done this in my previous changes. These options aren't meant to be exposed to dependee targets. This also allows us to disable/remove these options on a given target, without depender targets adding them back. Bug: b/145758253 Change-Id: Ieaba6824554d74e65d313409916bdf9ce4fd6182 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/43928 Kokoro-Result: kokoro <noreply+kokoro@google.com> Reviewed-by: 's avatarBen Clayton <bclayton@google.com> Tested-by: 's avatarAntonio Maiorano <amaiorano@google.com>
parent 514232c4
...@@ -76,11 +76,11 @@ target_compile_definitions(gl_common ...@@ -76,11 +76,11 @@ target_compile_definitions(gl_common
) )
target_compile_options(gl_common target_compile_options(gl_common
PUBLIC PRIVATE
${ROOT_PROJECT_COMPILE_OPTIONS} ${ROOT_PROJECT_COMPILE_OPTIONS}
) )
target_link_libraries(gl_common target_link_libraries(gl_common
PUBLIC PRIVATE
${ROOT_PROJECT_LINK_LIBRARIES} ${ROOT_PROJECT_LINK_LIBRARIES}
) )
...@@ -69,7 +69,7 @@ target_include_directories(vk_device ...@@ -69,7 +69,7 @@ target_include_directories(vk_device
) )
target_compile_options(vk_device target_compile_options(vk_device
PUBLIC PRIVATE
${ROOT_PROJECT_COMPILE_OPTIONS} ${ROOT_PROJECT_COMPILE_OPTIONS}
) )
......
...@@ -77,7 +77,7 @@ target_compile_definitions(gl_main ...@@ -77,7 +77,7 @@ target_compile_definitions(gl_main
) )
target_compile_options(gl_main target_compile_options(gl_main
PUBLIC PRIVATE
${ROOT_PROJECT_COMPILE_OPTIONS} ${ROOT_PROJECT_COMPILE_OPTIONS}
) )
......
...@@ -58,11 +58,11 @@ target_compile_definitions(libGLESCommon ...@@ -58,11 +58,11 @@ target_compile_definitions(libGLESCommon
) )
target_compile_options(libGLESCommon target_compile_options(libGLESCommon
PUBLIC PRIVATE
${ROOT_PROJECT_COMPILE_OPTIONS} ${ROOT_PROJECT_COMPILE_OPTIONS}
) )
target_link_libraries(libGLESCommon target_link_libraries(libGLESCommon
PUBLIC PRIVATE
${ROOT_PROJECT_LINK_LIBRARIES} ${ROOT_PROJECT_LINK_LIBRARIES}
) )
...@@ -99,7 +99,7 @@ target_include_directories(vk_pipeline ...@@ -99,7 +99,7 @@ target_include_directories(vk_pipeline
) )
target_compile_options(vk_pipeline target_compile_options(vk_pipeline
PUBLIC PRIVATE
${ROOT_PROJECT_COMPILE_OPTIONS} ${ROOT_PROJECT_COMPILE_OPTIONS}
) )
......
...@@ -85,7 +85,7 @@ target_compile_definitions(ReactorSubzero ...@@ -85,7 +85,7 @@ target_compile_definitions(ReactorSubzero
) )
target_compile_options(ReactorSubzero target_compile_options(ReactorSubzero
PUBLIC PRIVATE
${ROOT_PROJECT_COMPILE_OPTIONS} ${ROOT_PROJECT_COMPILE_OPTIONS}
) )
...@@ -120,7 +120,7 @@ target_compile_definitions(ReactorLLVM ...@@ -120,7 +120,7 @@ target_compile_definitions(ReactorLLVM
) )
target_compile_options(ReactorLLVM target_compile_options(ReactorLLVM
PUBLIC PRIVATE
${ROOT_PROJECT_COMPILE_OPTIONS} ${ROOT_PROJECT_COMPILE_OPTIONS}
) )
......
...@@ -83,7 +83,7 @@ target_compile_definitions(gl_renderer ...@@ -83,7 +83,7 @@ target_compile_definitions(gl_renderer
) )
target_compile_options(gl_renderer target_compile_options(gl_renderer
PUBLIC PRIVATE
${ROOT_PROJECT_COMPILE_OPTIONS} ${ROOT_PROJECT_COMPILE_OPTIONS}
) )
......
...@@ -67,7 +67,7 @@ target_compile_definitions(gl_shader ...@@ -67,7 +67,7 @@ target_compile_definitions(gl_shader
) )
target_compile_options(gl_shader target_compile_options(gl_shader
PUBLIC PRIVATE
${ROOT_PROJECT_COMPILE_OPTIONS} ${ROOT_PROJECT_COMPILE_OPTIONS}
) )
......
...@@ -65,6 +65,6 @@ target_include_directories(vk_system ...@@ -65,6 +65,6 @@ target_include_directories(vk_system
) )
target_compile_options(vk_system target_compile_options(vk_system
PUBLIC PRIVATE
${ROOT_PROJECT_COMPILE_OPTIONS} ${ROOT_PROJECT_COMPILE_OPTIONS}
) )
...@@ -70,7 +70,7 @@ target_include_directories(vk_wsi ...@@ -70,7 +70,7 @@ target_include_directories(vk_wsi
) )
target_compile_options(vk_wsi target_compile_options(vk_wsi
PUBLIC PRIVATE
${ROOT_PROJECT_COMPILE_OPTIONS} ${ROOT_PROJECT_COMPILE_OPTIONS}
) )
......
...@@ -55,6 +55,6 @@ target_compile_definitions(astc-encoder ...@@ -55,6 +55,6 @@ target_compile_definitions(astc-encoder
) )
target_compile_options(astc-encoder target_compile_options(astc-encoder
PUBLIC PRIVATE
${ROOT_PROJECT_COMPILE_OPTIONS} ${ROOT_PROJECT_COMPILE_OPTIONS}
) )
...@@ -105,7 +105,7 @@ target_include_directories(subzero ...@@ -105,7 +105,7 @@ target_include_directories(subzero
) )
target_compile_options(subzero target_compile_options(subzero
PUBLIC PRIVATE
${ROOT_PROJECT_COMPILE_OPTIONS} ${ROOT_PROJECT_COMPILE_OPTIONS}
${SUBZERO_COMPILE_OPTIONS} ${SUBZERO_COMPILE_OPTIONS}
) )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment