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

build: Set proper output directory for export headers and fix their installation

Browse Source
This commit is contained in:
Gabriel Ferreira
2025-02-02 21:24:49 +01:00
parent c4f4ffd16e
commit fd438d142b
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -173,6 +173,7 @@ function(build_lib)
# Set alias
add_library(ns3::${BLIB_LIBNAME} ALIAS ${BLIB_LIBNAME})
set(export_file)
if(${BLIB_GENERATE_EXPORT_HEADER})
include(GenerateExportHeader)
string(TOUPPER "${BLIB_LIBNAME}" uppercase_libname)
@@ -186,14 +187,12 @@ function(build_lib)
"\n#define ${uppercase_libname}_NO_EXPORT"
"\n#endif"
)
set(export_file ${CMAKE_HEADER_OUTPUT_DIRECTORY}/${BLIB_LIBNAME}-export.h)
generate_export_header(
${BLIB_LIBNAME} EXPORT_FILE_NAME ${BLIB_LIBNAME}-export.h
${BLIB_LIBNAME} EXPORT_FILE_NAME ${export_file}
CUSTOM_CONTENT_FROM_VARIABLE force_undef_export
)
set(export_file ${CMAKE_CURRENT_BINARY_DIR}/${BLIB_LIBNAME}-export.h)
set(export_dest ${CMAKE_HEADER_OUTPUT_DIRECTORY}/${BLIB_LIBNAME}-export.h)
file(COPY_FILE ${export_file} ${export_dest})
install(FILES ${export_file} DESTINATION include/ns3 COMPONENT Headers)
# In case building on Visual Studio
if(${MSVC})
@@ -213,7 +212,7 @@ function(build_lib)
${BLIB_LIBNAME}
PROPERTIES
PUBLIC_HEADER
"${BLIB_HEADER_FILES};${BLIB_DEPRECATED_HEADER_FILES};${CMAKE_HEADER_OUTPUT_DIRECTORY}/${BLIB_LIBNAME}-module.h"
"${BLIB_HEADER_FILES};${BLIB_DEPRECATED_HEADER_FILES};${CMAKE_HEADER_OUTPUT_DIRECTORY}/${BLIB_LIBNAME}-module.h;${export_file}"
PRIVATE_HEADER "${BLIB_PRIVATE_HEADER_FILES}"
# set output directory for DLLs
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}