Remove unnecessary feature detections, move filesystem defines to config.h.

Author: kblaschke

cmake/FilesystemSupport.cmake

@@ -18,18 +18,15 @@ unset(_old_CMAKE_CXX_STANDARD)
 if(NOT ENABLE_BOOST_FILESYSTEM AND STD_FILESYSTEM_EXISTS)
     set(CMAKE_CXX_STANDARD 17)
 
-    add_compile_definitions(
-            FS_NAMESPACE=std
-            FS_INCLUDE=<filesystem>
-            )
+    set(PROJECTM_FILESYSTEM_NAMESPACE std)
+    set(PROJECTM_FILESYSTEM_INCLUDE <filesystem>)
+    set(PROJECTM_FILESYSTEM_USE_BOOST FALSE)
 else()
     find_package(Boost REQUIRED COMPONENTS Filesystem)
 
-    add_compile_definitions(
-            FS_NAMESPACE=boost
-            FS_INCLUDE=<boost/filesystem.hpp>
-            FS_USING_BOOST
-            )
+    set(PROJECTM_FILESYSTEM_NAMESPACE boost)
+    set(PROJECTM_FILESYSTEM_INCLUDE <boost/filesystem.hpp>)
+    set(PROJECTM_FILESYSTEM_USE_BOOST TRUE)
 
     set(PROJECTM_FILESYSTEM_LIBRARY Boost::filesystem)
     set(ENABLE_BOOST_FILESYSTEM ON CACHE BOOL "Compiler does not support std::filesystem, reverting to boost::filesystem." FORCE)

config.h.cmake.in

@@ -1,73 +1,15 @@
 #pragma once
 
-/* Define to 1 if you have the `aligned_alloc' function. */
-#cmakedefine01 HAVE_ALIGNED_ALLOC
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#cmakedefine01 HAVE_DLFCN_H
-
-/* Define to 1 if you have the <fts.h> header file. */
-#cmakedefine01 HAVE_FTS_H
-
-/* Defined if a valid OpenGL implementation is found. */
-#cmakedefine01 HAVE_GL
-
-/* Define to 1 if you have the <GLES/gl.h> header file. */
-#cmakedefine01 HAVE_GLES_GL_H
-
-/* Define to 1 if you have the <GL/gl.h> header file. */
-#cmakedefine01 HAVE_GL_GL_H
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#cmakedefine01 HAVE_INTTYPES_H
-
-/* Define HAVE_LLVM */
-#cmakedefine01 HAVE_LLVM
-
-/* Define to 1 if you have the <memory.h> header file. */
-#cmakedefine01 HAVE_MEMORY_H
-
-/* Define to 1 if you have the <OpenGL/gl.h> header file. */
-#cmakedefine01 HAVE_OPENGL_GL_H
-
-/* Define to 1 if you have the `posix_memalign' function. */
-#cmakedefine01 HAVE_POSIX_MEMALIGN
-
-/* Have PTHREAD_PRIO_INHERIT. */
-#cmakedefine01 HAVE_PTHREAD_PRIO_INHERIT
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#cmakedefine HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#cmakedefine HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#cmakedefine HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#cmakedefine HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#cmakedefine HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#cmakedefine HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#cmakedefine HAVE_UNISTD_H
-
-/* Define to 1 if you have the <windows.h> header file. */
-#cmakedefine HAVE_WINDOWS_H
-
-/* Define to 1 if you have the ANSI C header files. */
-#cmakedefine STDC_HEADERS
-
 /* Define USE_GLES */
 #cmakedefine USE_GLES
 
 /* Define PROJECTM_USE_THREADS */
 #cmakedefine01 PROJECTM_USE_THREADS
 
 /* Version number of package */
-#define VERSION "@PROJECT_VERSION@"
+#define VERSION "@libprojectM_VERSION@"
+
+/* Boost or std filesystem API support */
+#cmakedefine PROJECTM_FILESYSTEM_USE_BOOST
+#define PROJECTM_FILESYSTEM_NAMESPACE @PROJECTM_FILESYSTEM_NAMESPACE@
+#define PROJECTM_FILESYSTEM_INCLUDE @PROJECTM_FILESYSTEM_INCLUDE@

features.cmake

@@ -1,12 +1,4 @@
-# Tests for various platform features and generates a header with the appropriate defines,
-# similar to the one created by autotools.
-
-include(CheckSymbolExists)
-include(CheckCXXSymbolExists)
-include(CheckFunctionExists)
-include(CheckIncludeFileCXX)
-include(CheckEnumValueExists)
-include(CheckIncludeFiles)
+# Tests for various platform features and generates a header with the appropriate defines.
 include(EnableCFlagsIfSupported)
 
 add_compile_definitions(
@@ -33,54 +25,6 @@ else()
     )
 endif()
 
-check_function_exists(aligned_alloc HAVE_ALIGNED_ALLOC)
-check_include_file_cxx("dlfcn.h" HAVE_DLFCN_H)
-check_include_file_cxx("fts.h" HAVE_FTS_H)
-check_include_file_cxx("GL/gl.h" HAVE_GL_GL_H)
-check_include_file_cxx("inttypes.h" HAVE_INTTYPES_H)
-check_include_file_cxx("memory.h" HAVE_MEMORY_H)
-check_function_exists(posix_memalign HAVE_POSIX_MEMALIGN)
-check_enum_value_exists("PTHREAD_PRIO_INHERIT" "pthread.h" HAVE_PTHREAD_PRIO_INHERIT)
-check_include_file_cxx("stdint.h" HAVE_STDINT_H)
-check_include_file_cxx("stdlib.h" HAVE_STDLIB_H)
-check_include_file_cxx("strings.h" HAVE_STRINGS_H)
-check_include_file_cxx("string.h" HAVE_STRING_H)
-check_include_file_cxx("sys/stat.h" HAVE_SYS_STAT_H)
-check_include_file_cxx("sys/types.h" HAVE_SYS_TYPES_H)
-check_include_file_cxx("unistd.h" HAVE_UNISTD_H)
-check_include_file_cxx("windows.h" HAVE_WINDOWS_H)
-
-set(_std_c_headers
-        # C89/C90
-        assert.h
-        ctype.h
-        errno.h
-        float.h
-        limits.h
-        locale.h
-        math.h
-        setjmp.h
-        signal.h
-        stdarg.h
-        stddef.h
-        stdio.h
-        stdlib.h
-        string.h
-        time.h
-        # C95/NA1
-        iso646.h
-        wctype.h
-        # C99
-        complex.h
-        fenv.h
-        inttypes.h
-        stdbool.h
-        stdint.h
-        tgmath.h
-        )
-check_include_files("${_std_c_headers}" STDC_HEADERS LANGUAGE C)
-unset(_std_c_headers)
-
 # Adds fallback support to boost if std::filesystem is unavailable.
 include(FilesystemSupport)
 

src/libprojectM/Renderer/FileScanner.cpp

@@ -4,8 +4,8 @@
 #include <cctype>
 
 // Fall back to boost if compiler doesn't support C++17
-#include FS_INCLUDE
-using namespace FS_NAMESPACE::filesystem;
+#include PROJECTM_FILESYSTEM_INCLUDE
+using namespace PROJECTM_FILESYSTEM_NAMESPACE::filesystem;
 
 namespace libprojectM {
 namespace Renderer {
@@ -49,7 +49,7 @@ void FileScanner::Scan(ScanCallback callback)
             for (const auto& entry : recursive_directory_iterator(basePath))
             {
                 // Skip files without extensions and everything that's not a normal file.
-#ifdef FS_USING_BOOST
+#ifdef PROJECTM_FILESYSTEM_USE_BOOST
                 if (!entry.path().has_extension() || (entry.status().type() != file_type::symlink_file && entry.status().type() != file_type::regular_file))
 #else
                 if (!entry.path().has_extension() || (is_symlink(entry.status()) && is_regular_file(entry.status())))

src/playlist/Playlist.cpp

@@ -3,8 +3,8 @@
 #include <algorithm>
 
 // Fall back to boost if compiler doesn't support C++17
-#include FS_INCLUDE
-using namespace FS_NAMESPACE::filesystem;
+#include PROJECTM_FILESYSTEM_INCLUDE
+using namespace PROJECTM_FILESYSTEM_NAMESPACE::filesystem;
 
 namespace libprojectM {
 namespace Playlist {