From cc68be51b3b050d00c7b84c91bb6ec8cca430aa1 Mon Sep 17 00:00:00 2001 From: Gabriel Ferreira Date: Fri, 13 May 2022 19:09:33 -0300 Subject: [PATCH] build: Allow module examples in subdirectories other than "examples" Fixes https://gitlab.com/nsnam/ns-3-dev/-/issues/655 --- build-support/custom-modules/ns3-module-macros.cmake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build-support/custom-modules/ns3-module-macros.cmake b/build-support/custom-modules/ns3-module-macros.cmake index 4efa2a741..32a4df3b2 100644 --- a/build-support/custom-modules/ns3-module-macros.cmake +++ b/build-support/custom-modules/ns3-module-macros.cmake @@ -488,7 +488,6 @@ function(build_lib_example) # Get path src/module or contrib/module string(REPLACE "${PROJECT_SOURCE_DIR}/" "" FOLDER "${CMAKE_CURRENT_SOURCE_DIR}") - get_filename_component(FOLDER ${FOLDER} DIRECTORY) # cmake-format: on check_for_missing_libraries( @@ -524,7 +523,7 @@ function(build_lib_example) set_runtime_outputdirectory( ${BLIB_EXAMPLE_NAME} - ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${FOLDER}/examples/ "" + ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${FOLDER}/ "" ) endif() endfunction()