Move third-party libraries to "vendor" dir.

Author: kblaschke

CMakeLists.txt

@@ -187,6 +187,7 @@ endif()
 include(features.cmake)
 
 add_subdirectory(presets)
+add_subdirectory(vendor)
 add_subdirectory(src)
 
 if(BUILD_TESTING)

src/libprojectM/CMakeLists.txt

@@ -85,7 +85,7 @@ target_include_directories(projectM_main
         "${CMAKE_SOURCE_DIR}/src"
         "${CMAKE_CURRENT_SOURCE_DIR}"
         "${CMAKE_CURRENT_SOURCE_DIR}/Renderer"
-        "${CMAKE_CURRENT_SOURCE_DIR}/Renderer/hlslparser/src"
+        "${CMAKE_SOURCE_DIR}/vendor/hlslparser/src"
         "${CMAKE_CURRENT_SOURCE_DIR}/MilkdropPresetFactory"
         "${MSVC_EXTRA_INCLUDE_DIR}"
         )

src/libprojectM/MilkdropPresetFactory/CMakeLists.txt

@@ -50,6 +50,7 @@ target_link_libraries(MilkdropPresetFactory
         PRIVATE
         libprojectM::API # For export header
         PUBLIC
+        omptl
         GLM::GLM
         ${PROJECTM_OPENGL_LIBRARIES}
         )

src/libprojectM/Renderer/CMakeLists.txt

@@ -1,6 +1,3 @@
-add_subdirectory(hlslparser)
-add_subdirectory(SOIL2)
-
 add_library(Renderer OBJECT
         BeatDetect.cpp
         BeatDetect.hpp

src/libprojectM/Renderer/PerPixelMesh.cpp

@@ -1,8 +1,8 @@
 #include <math.h>
 #include <algorithm>
 #include "PerPixelMesh.hpp"
-#include "omptl/omptl"
-#include "omptl/omptl_algorithm"
+#include <omptl/omptl>
+#include <omptl/omptl_algorithm>
 
 PerPixelMesh::PerPixelMesh(int _width, int _height) : width(_width), height(_height), size (_width * _height),
         p(_width * _height, PixelPoint(0,0)),

src/libprojectM/Renderer/Renderer.cpp

@@ -8,7 +8,7 @@
 #include <cstdio>
 #include <cstring>
 #include <cassert>
-#include "omptl/omptl_algorithm"
+#include <omptl/omptl_algorithm>
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/gtc/type_ptr.hpp>
 #include <chrono>

src/libprojectM/Renderer/hlslparser/.travis.yml

@@ -0,0 +1,3 @@
+add_subdirectory(hlslparser)
+add_subdirectory(omptl)
+add_subdirectory(SOIL2)

vendor/CMakeLists.txt

@@ -23,7 +23,7 @@ add_library(SOIL2 OBJECT
 
 target_include_directories(SOIL2
         PUBLIC
-        "${CMAKE_CURRENT_SOURCE_DIR}"
+        "."
         )
 
 target_link_libraries(SOIL2