F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: rename optional_visualizer_lib to ns3-optional-visualizer-lib

Browse Source
This commit is contained in:
Gabriel Ferreira
2023-11-18 19:05:48 -03:00
parent 9a3b1ffb68
commit 8a2f4b642c
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build-support/custom-modules/ns3-module-macros.cmake
View File

@@ -543,7 +543,7 @@ function(build_lib_example)
HEADER_FILES ${BLIB_EXAMPLE_HEADER_FILES}
LIBRARIES_TO_LINK
${lib${BLIB_LIBNAME}} ${BLIB_EXAMPLE_LIBRARIES_TO_LINK}
${optional_visualizer_lib}
${ns3-optional-visualizer-lib}
EXECUTABLE_DIRECTORY_PATH ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${FOLDER}/
${IGNORE_PCH}
)

8
build-support/macros-and-definitions.cmake
View File

@@ -114,7 +114,7 @@ macro(clear_global_cached_variables)
)
set(ns3-libs "" CACHE INTERNAL "list of processed upstream modules")
set(ns3-libs-tests "" CACHE INTERNAL "list of test libraries")
set(optional_visualizer_lib "" CACHE INTERNAL "visualizer library name")
set(ns3-optional-visualizer-lib "" CACHE INTERNAL "visualizer library name")
mark_as_advanced(
build_profile
@@ -128,7 +128,7 @@ macro(clear_global_cached_variables)
ns3-external-libs
ns3-libs
ns3-libs-tests
optional_visualizer_lib
ns3-optional-visualizer-lib
)
endmacro()
@@ -1183,7 +1183,7 @@ macro(process_options)
endforeach()
if(${ENABLE_VISUALIZER} AND (visualizer IN_LIST libs_to_build))
set(optional_visualizer_lib "${libvisualizer}"
set(ns3-optional-visualizer-lib "${libvisualizer}"
CACHE INTERNAL "visualizer library name"
)
endif()
@@ -1382,7 +1382,7 @@ macro(build_example)
EXECNAME ${EXAMPLE_NAME}
SOURCE_FILES ${EXAMPLE_SOURCE_FILES}
HEADER_FILES ${EXAMPLE_HEADER_FILES}
LIBRARIES_TO_LINK ${EXAMPLE_LIBRARIES_TO_LINK} ${optional_visualizer_lib}
LIBRARIES_TO_LINK ${EXAMPLE_LIBRARIES_TO_LINK} ${ns3-optional-visualizer-lib}
EXECUTABLE_DIRECTORY_PATH
${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/examples/${examplefolder}/
${IGNORE_PCH}

8
doc/manual/source/working-with-cmake.rst
View File

@@ -2269,7 +2269,7 @@ listed by ``./ns3 show targets`` or your IDE, check if all its dependencies were
EXECNAME ${EXAMPLE_NAME}
SOURCE_FILES ${EXAMPLE_SOURCE_FILES}
HEADER_FILES ${EXAMPLE_HEADER_FILES}
LIBRARIES_TO_LINK ${EXAMPLE_LIBRARIES_TO_LINK} ${optional_visualizer_lib}
LIBRARIES_TO_LINK ${EXAMPLE_LIBRARIES_TO_LINK} ${ns3-optional-visualizer-lib}
EXECUTABLE_DIRECTORY_PATH
${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/examples/${examplefolder}/
${IGNORE_PCH}
@@ -2741,8 +2741,8 @@ Then we check if the |ns3| modules required by the example are enabled to be bui
If the list ``missing_dependencies`` is empty, we create the example. Otherwise, we skip it.
The example can be linked to the current module (``${lib${BLIB_EXAMPLE_LIBNAME}}``) and
other libraries to link (``${BLIB_EXAMPLE_LIBRARIES_TO_LINK}``) and optionally to the visualizer
module (``${optional_visualizer_lib}``).
If the visualizer module is not enabled, ``optional_visualizer_lib`` is empty.
module (``${ns3-optional-visualizer-lib}``).
If the visualizer module is not enabled, ``ns3-optional-visualizer-lib`` is empty.
The example can also be linked to a single |ns3| shared library (``lib-ns3-monolib``) or
a single |ns3| static library (``lib-ns3-static``), if either ``NS3_MONOLIB=ON`` or ``NS3_STATIC=ON``.
@@ -2776,7 +2776,7 @@ Note that both of these options are handled by the ``build_exec`` macro.
HEADER_FILES ${BLIB_EXAMPLE_HEADER_FILES}
LIBRARIES_TO_LINK
${lib${BLIB_EXAMPLE_LIBNAME}} ${BLIB_EXAMPLE_LIBRARIES_TO_LINK}
${optional_visualizer_lib}
${ns3-optional-visualizer-lib}
EXECUTABLE_DIRECTORY_PATH ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${FOLDER}/
${IGNORE_PCH}
)