Merge pull request #72 from Rossmaxx/msvc-fix

Fixes to MSVC support for ci branch.

CMakeLists.txt

@@ -26,7 +26,10 @@ else()
 endif(FLTK_FOUND)
 
 if(MSVC)
-    find_package(LIBLO)
+    find_package(liblo)
+    if(liblo_FOUND)
+        set(LIBLO_FOUND TRUE)
+    endif()
 else()
     find_package(PkgConfig)
     if(PKG_CONFIG_FOUND)
@@ -185,8 +188,7 @@ maketest(message-alignment)
 maketest(test-arg-iter)
 if(LIBLO_FOUND)
     maketest(liblo)
-    target_include_directories(liblo PRIVATE ${LIBLO_INCLUDE_DIRS})
-    target_link_libraries(liblo      PRIVATE ${LIBLO_LIBRARIES})
+    target_link_libraries(liblo PRIVATE liblo::liblo)
 endif()
 
 maketestcpp(version)
@@ -206,8 +208,7 @@ maketestcpp(path-search)
 
 maketestcpp(performance)
 if(LIBLO_FOUND)
-    target_include_directories(performance PRIVATE ${LIBLO_INCLUDE_DIRS})
-    target_link_libraries(performance      PRIVATE ${LIBLO_LIBRARIES})
+    target_link_libraries(performance PRIVATE liblo::liblo)
     target_compile_definitions(performance PRIVATE HAVE_LIBLO)
 endif()
 
@@ -224,8 +225,8 @@ maketestcpp(test-automation)
 
 if(LIBLO_FOUND)
     add_library(lo-server test/liblo-server.cpp)
-    target_include_directories(lo-server PRIVATE ${LIBLO_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/include)
-    target_link_libraries(lo-server      PRIVATE ${LIBLO_LIBRARIES} rtosc-cpp rtosc)
+    target_include_directories(lo-server PRIVATE ${CMAKE_SOURCE_DIR}/include)
+    target_link_libraries(lo-server PRIVATE liblo::liblo)
     set(RTOSC_TEST_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/test CACHE INTERNAL "")
     set(RTOSC_TEST_LIB_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE INTERNAL "")
 endif()

test/performance.cpp

@@ -8,7 +8,7 @@
 #include <string>
 
 #ifdef HAVE_LIBLO
-#include <lo/lo_lowlevel.h>
+#include <lo/lo.h>
 #endif
 
 #include <rtosc/rtosc.h>