From 942aff3c599abc917884819d1821e95fb0ff09d3 Mon Sep 17 00:00:00 2001
From: Steffen Vogel <post@steffenvogel.de>
Date: Sun, 14 Jun 2020 15:02:16 +0200
Subject: [PATCH] cmake: several smaller improvements

---
 CMakeLists.txt             | 2 +-
 lib/CMakeLists.txt         | 4 ++--
 lib/api/CMakeLists.txt     | 2 +-
 lib/formats/CMakeLists.txt | 2 +-
 lib/nodes/CMakeLists.txt   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 811cf1ca5..cca55e2ad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -82,7 +82,7 @@ find_package(PkgConfig REQUIRED)
 find_package(Threads REQUIRED)
 find_package(Mosquitto)
 find_package(Opal)
-find_package(IBVerbs)
+find_package(IBVERBS)
 find_package(RDMACM)
 find_package(spdlog)
 find_package(Etherlab)
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 3fc9fbdc2..4fbb87328 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -29,9 +29,9 @@ list(APPEND INCLUDE_DIRS
 )
 
 set(LIBRARIES
+    villas-common
     PkgConfig::JANSSON
     PkgConfig::UUID
-    villas-common
     m
     stdc++
 )
@@ -137,7 +137,7 @@ endif()
 add_library(villas SHARED ${LIB_SRC})
 
 target_include_directories(villas PUBLIC ${INCLUDE_DIRS})
-target_link_libraries(villas PUBLIC ${LIBRARIES} villas-common)
+target_link_libraries(villas PUBLIC ${LIBRARIES})
 
 if(APPLE)
     target_link_libraries(villas PRIVATE -Wl,-all_load ${WHOLE_ARCHIVES} -Wl,-noall_load)
diff --git a/lib/api/CMakeLists.txt b/lib/api/CMakeLists.txt
index 16a2497bb..dcc6a29df 100644
--- a/lib/api/CMakeLists.txt
+++ b/lib/api/CMakeLists.txt
@@ -48,5 +48,5 @@ endif()
 
 add_library(api STATIC ${API_SRC})
 target_include_directories(api PUBLIC ${INCLUDE_DIRS})
-target_link_libraries(api INTERFACE ${LIBRARIES} PUBLIC villas-common)
+target_link_libraries(api PUBLIC ${LIBRARIES})
 
diff --git a/lib/formats/CMakeLists.txt b/lib/formats/CMakeLists.txt
index 9042b2a47..60dc54873 100644
--- a/lib/formats/CMakeLists.txt
+++ b/lib/formats/CMakeLists.txt
@@ -73,4 +73,4 @@ list(APPEND FORMAT_SRC
 
 add_library(formats STATIC ${FORMAT_SRC})
 target_include_directories(formats PUBLIC ${INCLUDE_DIRS})
-target_link_libraries(formats INTERFACE ${LIBRARIES} PUBLIC villas-common)
+target_link_libraries(formats PUBLIC ${LIBRARIES})
diff --git a/lib/nodes/CMakeLists.txt b/lib/nodes/CMakeLists.txt
index 4c2d4050b..0bb619085 100644
--- a/lib/nodes/CMakeLists.txt
+++ b/lib/nodes/CMakeLists.txt
@@ -166,4 +166,4 @@ endif()
 
 add_library(nodes STATIC ${NODE_SRC})
 target_include_directories(nodes PUBLIC ${INCLUDE_DIRS})
-target_link_libraries(nodes INTERFACE ${LIBRARIES} PUBLIC villas-common)
+target_link_libraries(nodes PUBLIC ${LIBRARIES})