Skip to content

Commit

Permalink
build, refactor: set LINK_FLAGS in setup_result_library.
Browse files Browse the repository at this point in the history
  • Loading branch information
xicilion committed Oct 30, 2023
1 parent ed7cca3 commit 8f50c1e
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 18 deletions.
2 changes: 0 additions & 2 deletions fibjs/addons/common.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,3 @@ setup_result_library(${name})

set_target_properties(${name} PROPERTIES PREFIX "")
set_target_properties(${name} PROPERTIES SUFFIX ".node")

set_target_properties(${name} PROPERTIES LINK_FLAGS ${link_flags})
15 changes: 0 additions & 15 deletions fibjs/program/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -48,21 +48,6 @@ if(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows")
endif()

if(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows")
if(link_flags)
set_target_properties(${name} PROPERTIES LINK_FLAGS ${link_flags})
set_target_properties(${name}_gui PROPERTIES LINK_FLAGS ${link_flags})
set_target_properties(js PROPERTIES LINK_FLAGS ${link_flags})
endif()

target_link_libraries(${name} comctl32)
target_link_libraries(${name}_gui comctl32)
target_link_libraries(js comctl32)

target_compile_definitions(${name} PUBLIC -D_CONSOLE)
target_compile_definitions(${name}_gui PUBLIC -D_WINDOWS)
else()
if(link_flags)
set_target_properties(${name} PROPERTIES LINK_FLAGS ${link_flags})
set_target_properties(js PROPERTIES LINK_FLAGS ${link_flags})
endif()
endif()
2 changes: 1 addition & 1 deletion vender
Submodule vender updated 1 files
+1 −1 build_tools

0 comments on commit 8f50c1e

Please sign in to comment.