Skip to content

Commit fcd935f

Browse files
authored
Merge pull request #7 from externpro/externproUpdate
externpro update
2 parents 4f0897b + 9e8adb1 commit fcd935f

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

CMakeLists.txt

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
cmake_minimum_required(VERSION 3.31)
2-
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/.devcontainer/cmake)
3-
set(CMAKE_PROJECT_TOP_LEVEL_INCLUDES xproinc)
4-
project(patch VERSION 2.7.6.3)
5-
include(flags)
2+
set(CMAKE_PROJECT_TOP_LEVEL_INCLUDES .devcontainer/cmake/xproinc.cmake)
3+
project(patch VERSION 2.7.6)
4+
include(xpflags)
65
include(GNUInstallDirs)
76
set(XP_INSTALL_CMAKEDIR ${CMAKE_INSTALL_DATADIR}/cmake)
87
include(ExternalProject)
98
set_property(DIRECTORY PROPERTY "EP_BASE" ${CMAKE_BINARY_DIR}/epbase)
109
if(WIN32 AND NOT UNIX)
11-
set(VER 2.7.6)
10+
set(VER ${CMAKE_PROJECT_VERSION})
1211
ExternalProject_Add(${PROJECT_NAME}
1312
DOWNLOAD_EXTRACT_TIMESTAMP true
1413
URL https://github.com/externpro/patch/releases/download/v2.7/patch-${VER}-bin.zip
@@ -26,7 +25,7 @@ if(WIN32 AND NOT UNIX)
2625
""
2726
)
2827
else()
29-
set(VER 2.7.6)
28+
set(VER ${CMAKE_PROJECT_VERSION})
3029
ExternalProject_Add(${PROJECT_NAME}
3130
DOWNLOAD_EXTRACT_TIMESTAMP true
3231
URL http://ftp.gnu.org/gnu/patch/patch-${VER}.tar.xz

0 commit comments

Comments
 (0)