Skip to content

Commit 705c9e8

Browse files
committed
fix(Git): ignore requirements.txt conflict
1 parent 05e36c8 commit 705c9e8

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

cmake/ProjectOptions.cmake

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,13 @@ if(EXISTS ${PROJECT_SOURCE_DIR}/COPYLEFT)
4141
)
4242
endif()
4343

44+
if(EXISTS ${PROJECT_SOURCE_DIR}/.gitconfig)
45+
find_package(Git)
46+
if(Git_FOUND)
47+
execute_process(COMMAND ${GIT_EXECUTABLE} config --local include.path ../.gitconfig)
48+
endif()
49+
endif()
50+
4451
find_package(Doxygen QUIET)
4552
if(DOXYGEN_FOUND AND EXISTS ${PROJECT_SOURCE_DIR}/cmake/Doxyfile.in)
4653
# set input and output files

0 commit comments

Comments
 (0)