Skip to content

Commit 150707c

Browse files
authored
Merge pull request #225 from Libvisual/cmake-add-link-options
Core, Plugins (Build): Support link options in LV_BUILD_TEST() and LV_BUILD_PLUGIN().
2 parents ca0c53b + b7c26fa commit 150707c

2 files changed

Lines changed: 12 additions & 2 deletions

File tree

libvisual-plugins/cmake/LVBuildPlugin.cmake

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ FUNCTION(LV_BUILD_PLUGIN PLUGIN_NAME PLUGIN_TYPE)
1111

1212
SET(OPTION_ARGS "")
1313
SET(SINGLE_ARGS "")
14-
SET(MULTI_ARGS "SOURCES" "COMPILE_DEFS" "COMPILE_OPTIONS" "INCLUDE_DIRS" "LINK_DIRS" "LINK_LIBS")
14+
SET(MULTI_ARGS "SOURCES" "COMPILE_DEFS" "COMPILE_OPTIONS" "INCLUDE_DIRS" "LINK_DIRS" "LINK_LIBS" "LINK_OPTIONS")
1515
CMAKE_PARSE_ARGUMENTS(PARSED_ARGS "${OPTION_FLAGS}" "${SINGLE_ARGS}" "${MULTI_ARGS}" ${ARGN})
1616

1717
IF(NOT PARSED_ARGS_SOURCES)
@@ -47,6 +47,11 @@ FUNCTION(LV_BUILD_PLUGIN PLUGIN_NAME PLUGIN_TYPE)
4747
${PARSED_ARGS_LINK_DIRS}
4848
)
4949

50+
TARGET_LINK_OPTIONS(${SO_NAME}
51+
PRIVATE
52+
${PARSE_ARGS_LINK_OPTIONS}
53+
)
54+
5055
SET_TARGET_PROPERTIES(${SO_NAME} PROPERTIES
5156
LINK_FLAGS -Wl,--unresolved-symbols,ignore-in-shared-libs
5257
)

libvisual/cmake/LVBuildTest.cmake

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ INCLUDE(CMakeParseArguments)
33
FUNCTION(LV_BUILD_TEST TEST_NAME)
44
SET(OPTION_ARGS "")
55
SET(SINGLE_ARGS "")
6-
SET(MULTI_ARGS "ARGS" "SOURCES" "COMPILE_DEFS" "COMPILE_OPTIONS" "INCLUDE_DIRS" "LINK_DIRS" "LINK_LIBS")
6+
SET(MULTI_ARGS "ARGS" "SOURCES" "COMPILE_DEFS" "COMPILE_OPTIONS" "INCLUDE_DIRS" "LINK_DIRS" "LINK_LIBS" "LINK_OPTIONS")
77
CMAKE_PARSE_ARGUMENTS(PARSED_ARGS "${OPTION_FLAGS}" "${SINGLE_ARGS}" "${MULTI_ARGS}" ${ARGN})
88

99
IF(NOT PARSED_ARGS_SOURCES)
@@ -40,6 +40,11 @@ FUNCTION(LV_BUILD_TEST TEST_NAME)
4040
${PARSED_ARGS_LINK_LIBS}
4141
)
4242

43+
TARGET_LINK_OPTIONS(${TEST_NAME}
44+
PRIVATE
45+
${PARSE_ARGS_LINK_OPTIONS}
46+
)
47+
4348
ADD_TEST(${TEST_NAME}
4449
${CMAKE_COMMAND} -E chdir ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/${TEST_NAME} ${PARSE_ARGS_ARGS}
4550
)

0 commit comments

Comments
 (0)