Commit d1036201 by Edward Thomson

meta: generated `features.h` is now `git2_features.h`

Linux has a /usr/include/features.h, which gets confusing; update this
to `git2_features.h` and move it into the `util` directory.
parent 04f34688
...@@ -171,12 +171,6 @@ endif() ...@@ -171,12 +171,6 @@ endif()
add_feature_info(iconv GIT_USE_ICONV "iconv encoding conversion support") add_feature_info(iconv GIT_USE_ICONV "iconv encoding conversion support")
# #
# Configure support
#
configure_file(features.h.in git2/sys/features.h)
#
# Include child projects # Include child projects
# #
......
set(CLI_INCLUDES set(CLI_INCLUDES
"${libgit2_BINARY_DIR}/src" "${libgit2_BINARY_DIR}/src/util"
"${libgit2_SOURCE_DIR}/src/util" "${libgit2_SOURCE_DIR}/src/util"
"${libgit2_SOURCE_DIR}/src/cli" "${libgit2_SOURCE_DIR}/src/cli"
"${libgit2_SOURCE_DIR}/include") "${libgit2_SOURCE_DIR}/include")
......
...@@ -8,7 +8,7 @@ set_target_properties(libgit2 PROPERTIES C_EXTENSIONS OFF) ...@@ -8,7 +8,7 @@ set_target_properties(libgit2 PROPERTIES C_EXTENSIONS OFF)
include(PkgBuildConfig) include(PkgBuildConfig)
set(LIBGIT2_INCLUDES set(LIBGIT2_INCLUDES
"${PROJECT_BINARY_DIR}/src" "${PROJECT_BINARY_DIR}/src/util"
"${PROJECT_SOURCE_DIR}/src/libgit2" "${PROJECT_SOURCE_DIR}/src/libgit2"
"${PROJECT_SOURCE_DIR}/src/util" "${PROJECT_SOURCE_DIR}/src/util"
"${PROJECT_SOURCE_DIR}/include") "${PROJECT_SOURCE_DIR}/include")
......
...@@ -4,8 +4,10 @@ add_library(util OBJECT) ...@@ -4,8 +4,10 @@ add_library(util OBJECT)
set_target_properties(util PROPERTIES C_STANDARD 90) set_target_properties(util PROPERTIES C_STANDARD 90)
set_target_properties(util PROPERTIES C_EXTENSIONS OFF) set_target_properties(util PROPERTIES C_EXTENSIONS OFF)
configure_file(git2_features.h.in git2_features.h)
set(UTIL_INCLUDES set(UTIL_INCLUDES
"${PROJECT_BINARY_DIR}/src" "${PROJECT_BINARY_DIR}/src/util"
"${PROJECT_SOURCE_DIR}/src/util" "${PROJECT_SOURCE_DIR}/src/util"
"${PROJECT_SOURCE_DIR}/include") "${PROJECT_SOURCE_DIR}/include")
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
#ifndef INCLUDE_git2_util_h__ #ifndef INCLUDE_git2_util_h__
#define INCLUDE_git2_util_h__ #define INCLUDE_git2_util_h__
#ifndef LIBGIT2_NO_FEATURES_H #if !defined(LIBGIT2_NO_FEATURES_H)
# include "git2/sys/features.h" # include "git2_features.h"
#endif #endif
#include "git2/common.h" #include "git2/common.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment