Implement tox_loop

2 files changed, 47 insertions, 12 deletions

diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
index 5ad332bd..4cb96594 100644
--- a/cmake/Dependencies.cmake
+++ b/cmake/Dependencies.cmake
@@ -8,30 +8,38 @@ include(ModulePackage)
 
 find_package(Threads REQUIRED)
 
-find_library(NCURSES_LIBRARIES      ncurses      )
-find_library(UTIL_LIBRARIES         util         )
-find_library(RT_LIBRARIES           rt           )
+find_library(NCURSES_LIBRARIES      ncurses           )
+find_library(UTIL_LIBRARIES         util              )
+find_library(RT_LIBRARIES           rt                )
 
 # For toxcore.
-pkg_use_module(LIBSODIUM            libsodium    )
+pkg_use_module(LIBSODIUM            libsodium         )
+pkg_use_module(LIBEV                ev                )
+if(NOT LIBEV_FOUND)
+  if(NOT WIN32)
+    pkg_use_module(LIBEVENT         libevent_pthreads )
+  else()
+    pkg_use_module(LIBEVENT         libevent          )
+  endif()
+endif()
 
 # For toxav.
-pkg_use_module(OPUS                 opus         )
-pkg_use_module(VPX                  vpx          )
+pkg_use_module(OPUS                 opus              )
+pkg_use_module(VPX                  vpx               )
 
 # For tox-bootstrapd.
-pkg_use_module(LIBCONFIG            libconfig    )
+pkg_use_module(LIBCONFIG            libconfig         )
 
 # For auto tests.
-pkg_use_module(CHECK                check        )
+pkg_use_module(CHECK                check             )
 
 # For tox-spectest.
-pkg_use_module(MSGPACK              msgpack      )
+pkg_use_module(MSGPACK              msgpack           )
 
 # For av_test.
-pkg_use_module(OPENCV               opencv       )
-pkg_use_module(PORTAUDIO            portaudio-2.0)
-pkg_use_module(SNDFILE              sndfile      )
+pkg_use_module(OPENCV               opencv            )
+pkg_use_module(PORTAUDIO            portaudio-2.0     )
+pkg_use_module(SNDFILE              sndfile           )
 
 ###############################################################################
 #
diff --git a/cmake/ModulePackage.cmake b/cmake/ModulePackage.cmake
index 3a4eb9b9..4d22ee41 100644
--- a/cmake/ModulePackage.cmake
+++ b/cmake/ModulePackage.cmake
@@ -2,6 +2,8 @@ option(ENABLE_SHARED "Build shared (dynamic) libraries for all modules" ON)
 option(ENABLE_STATIC "Build static libraries for all modules" ON)
 option(COMPILE_AS_CXX "Compile all C code as C++ code" OFF)
 
+include(FindPackageHandleStandardArgs)
+
 if(NOT ENABLE_SHARED AND NOT ENABLE_STATIC)
   message(WARNING
     "Both static and shared libraries are disabled; "
@@ -48,6 +50,31 @@ function(pkg_use_module mod pkg)
       set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -isystem ${dir}" PARENT_SCOPE)
       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${dir}" PARENT_SCOPE)
     endforeach()
+  else()
+    set(${mod}_DEFINITIONS ${${mod}_CFLAGS_OTHER})
+    find_path(${mod}_INCLUDE_DIR NAMES ${ARGV1}.h
+      HINTS ${${mod}_INCLUDEDIR} ${${mod}_INCLUDE_DIRS}
+      PATH_SUFFIXES ${ARGV1})
+    find_library(${mod}_LIBRARY NAMES ${ARGV1} lib${ARGV1}
+      HINTS ${${mod}_LIBDIR} ${${mod}_LIBRARY_DIRS})
+    find_package_handle_standard_args(${mod} DEFAULT_MSG
+      ${mod}_LIBRARY ${mod}_INCLUDE_DIR)
+
+    if(${mod}_FOUND)
+      mark_as_advanced(${mod}_INCLUDE_DIR ${mod}_LIBRARY)
+      set(${mod}_LIBRARIES ${${mod}_LIBRARY} PARENT_SCOPE)
+      set(${mod}_INCLUDE_DIRS ${${mod}_INCLUDE_DIR} PARENT_SCOPE)
+      set(${mod}_FOUND TRUE PARENT_SCOPE)
+      link_directories(${${mod}_LIBRARY_DIRS})
+      include_directories(${${mod}_INCLUDE_DIRS})
+      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${${mod}_CFLAGS_OTHER}" PARENT_SCOPE)
+      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${${mod}_CFLAGS_OTHER}" PARENT_SCOPE)
+
+      foreach(dir ${${mod}_INCLUDE_DIRS})
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -isystem ${dir}" PARENT_SCOPE)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -isystem ${dir}" PARENT_SCOPE)
+      endforeach()
+    endif()
   endif()
 endfunction()