File tree Expand file tree Collapse file tree 1 file changed +5
-0
lines changed Expand file tree Collapse file tree 1 file changed +5
-0
lines changed Original file line number Diff line number Diff line change @@ -128,6 +128,7 @@ function(packageProject)
128
128
COMPATIBILITY ${PROJECT_COMPATIBILITY} ${wbpvf_extra_args}
129
129
)
130
130
131
+ <<<<<<< HEAD
131
132
# set default runtime install subdirectory (RUNTIME_DESTINATION)
132
133
if (NOT DEFINED PROJECT_RUNTIME_DESTINATION)
133
134
set (PROJECT_RUNTIME_DESTINATION ${PROJECT_NAME}${PROJECT_VERSION_SUFFIX} )
@@ -136,6 +137,10 @@ function(packageProject)
136
137
if (${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.23.0" AND PROJECT_HEADER_SETS)
137
138
# required to install if use in project target since CMake 3.23
138
139
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)
139
144
endif ()
140
145
141
146
install (
You can’t perform that action at this time.
0 commit comments