MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'BenLubar/custom-plugins-cmake' into develop

develop
lethosor 2018-07-18 19:09:05 -04:00
parent 777a9147df 3e82bd8f35
commit 1a2694fa2c
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
Unescape Escape View File

@ -57,3 +57,6 @@ tags
/build/win64/DF_PATH.txt /build/win64/DF_PATH.txt
/build/win32/DF_PATH.txt /build/win32/DF_PATH.txt
/.vs /.vs
# custom plugins
/plugins/CMakeLists.custom.txt

3
plugins/CMakeLists.custom.txt
Unescape Escape View File

@ -1,3 +0,0 @@
# You can add custom plugins here to avoid touching plugins/CMakeLists.txt,
# This can be useful if you've made modifications to that file and try to
# switch between branches that have also made modifications to it.

8
plugins/CMakeLists.txt
Unescape Escape View File

@ -178,4 +178,12 @@ if(BUILD_SKELETON)
add_subdirectory(skeleton) add_subdirectory(skeleton)
endif() endif()
if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.custom.txt")
FILE(WRITE "${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.custom.txt" "# You can add custom plugins here to avoid touching plugins/CMakeLists.txt,
# This can be useful if you've made modifications to that file and try to
# switch between branches that have also made modifications to it.
")
endif()
INCLUDE(CMakeLists.custom.txt) INCLUDE(CMakeLists.custom.txt)