Skip to content

Commit 147c5c0

Browse files
committed
revert my demo failure
1 parent 29c7f17 commit 147c5c0

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ function(packageProject)
128128
COMPATIBILITY ${PROJECT_COMPATIBILITY} ${wbpvf_extra_args}
129129
)
130130

131+
<<<<<<< HEAD
131132
# set default runtime install subdirectory (RUNTIME_DESTINATION)
132133
if(NOT DEFINED PROJECT_RUNTIME_DESTINATION)
133134
set(PROJECT_RUNTIME_DESTINATION ${PROJECT_NAME}${PROJECT_VERSION_SUFFIX})
@@ -136,6 +137,10 @@ function(packageProject)
136137
if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.23.0" AND PROJECT_HEADER_SETS)
137138
# required to install if use in project target since CMake 3.23
138139
set(FILE_SET_ARGS "FILE_SET" "${PROJECT_HEADER_SETS}")
140+
=======
141+
if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.23.0")
142+
set(FILE_SET_ARGS "FILE_SET" "HEADERS")
143+
>>>>>>> 43ff42c (revert my demo failure)
139144
endif()
140145

141146
install(

0 commit comments

Comments
 (0)