[chg] Adapted link dependencies

71e079b2 · Oliver Horst · 4dbec35b · 71e079b2 · 71e079b2
Commit 71e079b2 authored May 07, 2020 by Oliver Horst
Showing with 12 additions and 5 deletions

GCC/ARM_CA53_64_BIT/CMakeLists.txt GCC/ARM_CA53_64_BIT/CMakeLists.txt +9 -3

GCC/ARM_CA53_64_BIT/freertos-portable-config.cmake.in GCC/ARM_CA53_64_BIT/freertos-portable-config.cmake.in +3 -2

No files found.
--- a/GCC/ARM_CA53_64_BIT/CMakeLists.txt
+++ b/GCC/ARM_CA53_64_BIT/CMakeLists.txt
@@ -17,7 +17,7 @@ find_package(
 )

 find_package(
-    xil-headers 7.0
+    xil 7.0
    REQUIRED
 )

@@ -26,6 +26,11 @@ find_package(
    REQUIRED
 )

+find_package(
+    toki-hal-headers 0.1
+    REQUIRED
+)
+
 find_package(
    toki-perfmon 0.1
    REQUIRED
@@ -42,9 +47,10 @@ add_library(
 target_link_libraries(
    freertos-portable
        #
-        PRIVATE     freertos-headers
-                    xil-headers
+        PUBLIC      freertos-headers
                    toki-libc-headers
+                    toki-hal-headers
+                    xil
                    toki-perfmon
 )


--- a/GCC/ARM_CA53_64_BIT/freertos-portable-config.cmake.in
+++ b/GCC/ARM_CA53_64_BIT/freertos-portable-config.cmake.in
@@ -2,10 +2,11 @@

 include(CMakeFindDependencyMacro)

+find_dependency(xil)
 find_dependency(freertos-headers)
-find_dependency(xil-headers)
-find_dependency(toki-hal)
 find_dependency(toki-perfmon)
+find_dependency(toki-libc-headers)
+find_dependency(toki-hal-headers)

 # Import targets
 include(${CMAKE_CURRENT_LIST_DIR}/freertos-portable-targets.cmake)