Skip to content

fix(CMake): better organize generated headers #1221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BotellaA merged 1 commit into from
Dec 30, 2025
Merged

fix(CMake): better organize generated headers #1221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"C_Cpp.default.cppStandard": "c++17",
"C_Cpp.default.includePath": [
"${workspaceFolder}/include",
"${workspaceFolder}/build/opengeode",
"${workspaceFolder}/build/opengeode/include",
"${workspaceFolder}/build/third_party/abseil/install/include",
"${workspaceFolder}/build/third_party/asyncplusplus/install/include",
"${workspaceFolder}/build/third_party/earcut/install/include",
Expand Down
9 changes: 5 additions & 4 deletions cmake/CppTargets.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ function(add_geode_library)
set(VERSION_RC_FILE_IN ${PROJECT_SOURCE_DIR}/cmake/version.rc.in)
if(EXISTS ${VERSION_RC_FILE_IN})
message(STATUS "Configuring ${GEODE_LIB_NAME} version.rc")
set(VERSION_RC_FILE ${PROJECT_BINARY_DIR}/${GEODE_LIB_FOLDER}/version.rc)
set(VERSION_RC_FILE ${PROJECT_BINARY_DIR}/include/${GEODE_LIB_FOLDER}/version.rc)
configure_file(
${VERSION_RC_FILE_IN}
${VERSION_RC_FILE}
Expand Down Expand Up @@ -121,20 +121,21 @@ function(add_geode_library)
target_include_directories(${GEODE_LIB_NAME}
PUBLIC
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>
$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
)
target_link_libraries(${GEODE_LIB_NAME}
PUBLIC ${GEODE_LIB_PUBLIC_DEPENDENCIES}
PRIVATE ${GEODE_LIB_PRIVATE_DEPENDENCIES}
)
_export_library(${GEODE_LIB_NAME})
set(EXPORTED_HEADER ${PROJECT_BINARY_DIR}/include/${GEODE_LIB_FOLDER}/${project_name}_${GEODE_LIB_NAME}_export.hpp)
generate_export_header(${GEODE_LIB_NAME}
BASE_NAME ${project_name}_${GEODE_LIB_NAME}
EXPORT_MACRO_NAME ${project_name}_${GEODE_LIB_NAME}_api
EXPORT_FILE_NAME ${PROJECT_BINARY_DIR}/${GEODE_LIB_FOLDER}/${project_name}_${GEODE_LIB_NAME}_export.hpp
EXPORT_FILE_NAME ${EXPORTED_HEADER}
)
install(FILES ${PROJECT_BINARY_DIR}/${GEODE_LIB_FOLDER}/${project_name}_${GEODE_LIB_NAME}_export.hpp
install(FILES ${EXPORTED_HEADER}
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${GEODE_LIB_FOLDER}
COMPONENT public
)
Expand Down