Add option to use system projectm-eval (used in vcpkg)

projectM-visualizer · Aug 7, 2024 · 6d20977 · 6d20977
1 parent 7a449cc
commit 6d20977
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 37 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -74,6 +74,7 @@ cmake_dependent_option(ENABLE_GLES "Enable OpenGL ES support" OFF "NOT ENABLE_EM
 option(ENABLE_BOOST_FILESYSTEM "Force the use of boost::filesystem, even if the compiler supports C++17." OFF)
 cmake_dependent_option(ENABLE_INSTALL "Enable installing projectM libraries and headers." OFF "NOT PROJECT_IS_TOP_LEVEL" ON)
 option(ENABLE_SYSTEM_GLM "Enable use of system-install GLM library" OFF)
+option(ENABLE_SYSTEM_PROJECTM_EVAL "Enable use of a system-installed/external projectM-eval library" ON)
 option(BUILD_DOCS "Build documentation" OFF)
 
 # Experimental/unsupported features
@@ -83,6 +84,10 @@ if(ENABLE_SYSTEM_GLM)
     find_package(GLM REQUIRED)
 endif()
 
+if(ENABLE_SYSTEM_PROJECTM_EVAL)
+    find_package(projectM-Eval)
+endif()
+
 if(NOT BUILD_SHARED_LIBS AND CMAKE_SYSTEM_NAME STREQUAL "Windows")
     # Add "lib" in front of static library files to allow installing both shared and static libs in the same dir.
     set(CMAKE_STATIC_LIBRARY_PREFIX lib)
@@ -217,46 +222,47 @@ message(STATUS "")
 message(STATUS "libprojectM v${PROJECT_VERSION}")
 message(STATUS "==============================================")
 message(STATUS "")
-message(STATUS "    prefix:                  ${CMAKE_INSTALL_PREFIX}")
-message(STATUS "    libdir:                  ${PROJECTM_LIB_DIR}")
-message(STATUS "    includedir:              ${PROJECTM_INCLUDE_DIR}")
-message(STATUS "    bindir:                  ${PROJECTM_BIN_DIR}")
+message(STATUS "    prefix:                      ${CMAKE_INSTALL_PREFIX}")
+message(STATUS "    libdir:                      ${PROJECTM_LIB_DIR}")
+message(STATUS "    includedir:                  ${PROJECTM_INCLUDE_DIR}")
+message(STATUS "    bindir:                      ${PROJECTM_BIN_DIR}")
 message(STATUS "")
-message(STATUS "    compiler:                ${CMAKE_CXX_COMPILER}")
-message(STATUS "    cflags:                  ${CMAKE_C_FLAGS}")
-message(STATUS "    cxxflags:                ${CMAKE_CXX_FLAGS}")
-message(STATUS "    ldflags:                 ${CMAKE_SHARED_LINKER_FLAGS}")
+message(STATUS "    compiler:                    ${CMAKE_CXX_COMPILER}")
+message(STATUS "    cflags:                      ${CMAKE_C_FLAGS}")
+message(STATUS "    cxxflags:                    ${CMAKE_CXX_FLAGS}")
+message(STATUS "    ldflags:                     ${CMAKE_SHARED_LINKER_FLAGS}")
 message(STATUS "")
 message(STATUS "Features:")
 message(STATUS "==============================================")
 message(STATUS "")
-message(STATUS "    Build shared libraries:  ${BUILD_SHARED_LIBS}")
+message(STATUS "    Build shared libraries:      ${BUILD_SHARED_LIBS}")
 if(ENABLE_BOOST_FILESYSTEM)
-    message(STATUS "    Filesystem support:      Boost")
-    message(STATUS "        Boost version:       ${Boost_VERSION}")
+    message(STATUS "    Filesystem support:          Boost")
+    message(STATUS "        Boost version:           ${Boost_VERSION}")
 else()
-    message(STATUS "    Filesystem support:      C++17 STL")
+    message(STATUS "    Filesystem support:          C++17 STL")
 endif()
-message(STATUS "    SDL2:                    ${ENABLE_SDL_UI}")
+message(STATUS "    SDL2:                        ${ENABLE_SDL_UI}")
 if(ENABLE_SDL_UI)
-    message(STATUS "        SDL2 version:        ${SDL2_VERSION}")
+    message(STATUS "        SDL2 version:            ${SDL2_VERSION}")
 endif()
-message(STATUS "    OpenGL ES:               ${ENABLE_GLES}")
-message(STATUS "    Emscripten:              ${ENABLE_EMSCRIPTEN}")
+message(STATUS "    OpenGL ES:                   ${ENABLE_GLES}")
+message(STATUS "    Emscripten:                  ${ENABLE_EMSCRIPTEN}")
 if(CMAKE_SYSTEM_NAME STREQUAL Emscripten)
     message(STATUS "    - PThreads:              ${USE_PTHREADS}")
 endif()
-message(STATUS "    Use system GLM:          ${ENABLE_SYSTEM_GLM}")
-message(STATUS "    Link UI with shared lib: ${ENABLE_SHARED_LINKING}")
+message(STATUS "    Use system GLM:              ${ENABLE_SYSTEM_GLM}")
+message(STATUS "    Use system projectM-eval:    ${ENABLE_SYSTEM_PROJECTM_EVAL}")
+message(STATUS "    Link UI with shared lib:     ${ENABLE_SHARED_LINKING}")
 message(STATUS "")
 message(STATUS "Targets and applications:")
 message(STATUS "==============================================")
 message(STATUS "")
-message(STATUS "    libprojectM:             (always built)")
-message(STATUS "    Playlist library:        ${ENABLE_PLAYLIST}")
-message(STATUS "    SDL2 Test UI:            ${ENABLE_SDL_UI}")
-message(STATUS "    Tests:                   ${BUILD_TESTING}")
-message(STATUS "    Documentation:           ${BUILD_DOCS}")
+message(STATUS "    libprojectM:                 (always built)")
+message(STATUS "    Playlist library:            ${ENABLE_PLAYLIST}")
+message(STATUS "    SDL2 Test UI:                ${ENABLE_SDL_UI}")
+message(STATUS "    Tests:                       ${BUILD_TESTING}")
+message(STATUS "    Documentation:               ${BUILD_DOCS}")
 message(STATUS "")
 
 if(ENABLE_CXX_INTERFACE)

diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json
@@ -1,8 +1,8 @@
 {
-    "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg-configuration.schema.json",
-    "default-registry": {
-        "kind": "git",
-        "baseline": "638b1588be3a265a9c7ad5b212cef72a1cad336a",
-        "repository": "https://github.com/microsoft/vcpkg"
-    }
-}
+  "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg-configuration.schema.json",
+  "default-registry": {
+    "kind": "git",
+    "baseline": "815d93b520779e4354bb4b954fc2179b3e520c26",
+    "repository": "https://github.com/microsoft/vcpkg"
+  }
+}
diff --git a/vcpkg.json b/vcpkg.json
@@ -1,8 +1,8 @@
 {
-    "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
-    "dependencies": [
-        "glew",
-        "gtest",
-        "sdl2"
-    ]
-}
+  "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
+  "dependencies": [
+    "glew",
+    "gtest",
+    "sdl2"
+  ]
+}
diff --git a/vendor/CMakeLists.txt b/vendor/CMakeLists.txt
@@ -2,5 +2,7 @@ if(NOT ENABLE_SYSTEM_GLM)
     add_subdirectory(glm)
 endif()
 add_subdirectory(hlslparser)
+if(NOT TARGET projectM::Eval)
 add_subdirectory(projectm-eval)
+endif()
 add_subdirectory(SOIL2)