Refactor the CMake 3rdparty/Vc-related bits (#1903)

* Include the 3rdparty/ dir from top-level * Set includes/libs at top-level * Remove the inner CMake version requirement * Fix deprecated use of CMake's exec_program()
brndnmtthws · May 13, 2024 · 71d0251 · 71d0251
1 parent 49a43e4
commit 71d0251
Show file tree

Hide file tree

Showing 4 changed files with 122 additions and 82 deletions.
diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
@@ -1,7 +1,4 @@
-# Version 1.4.4
+# Vc version 1.4.4
 add_subdirectory(Vc)
-set(conky_libs ${conky_libs} Vc)
-set(conky_includes ${conky_includes} "${CMAKE_CURRENT_SOURCE_DIR}/Vc")
 
-set(conky_libs ${conky_libs} PARENT_SCOPE)
-set(conky_includes ${conky_includes} PARENT_SCOPE)
+add_subdirectory(toluapp)
diff --git a/3rdparty/Vc/CMakeLists.txt b/3rdparty/Vc/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+# cmake_minimum_required(VERSION 3.0)
 
 cmake_policy(SET CMP0028 NEW) # Double colon in target name means ALIAS or IMPORTED target.
 cmake_policy(SET CMP0048 NEW) # The ``project()`` command manages VERSION variables.