--- a/glslViewer/CMakeLists.txt +++ b/glslViewer/CMakeLists.txt @@ -31,7 +31,10 @@ add_executable(glslViewer ${ROOT_SOURCE}) -include_directories(deps/liblo) +include(FindPkgConfig) +pkg_search_module(LIBLO REQUIRED liblo>=0.31) +include_directories(glslViewer PRIVATE ${LIBLO_INCLUDE_DIRS}) +target_link_libraries(glslViewer PRIVATE ${LIBLO_LIBRARIES}) target_include_directories(glslViewer PRIVATE deps) target_link_libraries(glslViewer PRIVATE vera) target_compile_definitions(glslViewer PRIVATE GLSLVIEWER_VERSION_MAJOR=${VERSION_MAJOR}) @@ -151,7 +154,7 @@ set(CPACK_GENERATOR "ZIP") else() - target_link_libraries(glslViewer PRIVATE pthread dl lo_static) + target_link_libraries(glslViewer PRIVATE pthread dl) install(TARGETS glslViewer DESTINATION bin) if (NOT APPLE) --- a/glslViewer/deps/CMakeLists.txt +++ b/glslViewer/deps/CMakeLists.txt @@ -1,6 +1,2 @@ ## Ada add_subdirectory(vera) - -if (NOT EMSCRIPTEN) - add_subdirectory(liblo/cmake) -endif() \ No newline at end of file