Skip to content

Commit f5283d2

Browse files
committed
Resolve conflicts and make formatting consistent.
1 parent 540a132 commit f5283d2

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

src/asar/CMakeLists.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -245,6 +245,7 @@ if(ASAR_GEN_EXE)
245245
)
246246

247247
install(TARGETS asar-standalone)
248+
248249
endif(ASAR_GEN_EXE)
249250

250251

@@ -294,13 +295,13 @@ if (ASAR_GEN_LIB)
294295
target_compile_definitions(asar-static PRIVATE "ASAR_STATIC")
295296
set_asar_shared_properties(asar-static "D" FALSE)
296297

297-
install(TARGETS asar-static)
298-
299-
# there's no need to set the PDB name since static libraries don't produce PDBs
300298
set_target_properties(asar-static
301299
PROPERTIES
302300
ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/lib"
303301
LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/lib"
304302
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/lib"
305303
)
304+
305+
install(TARGETS asar-static)
306+
306307
endif()

0 commit comments

Comments
 (0)