Skip to content

GH-48025: [C++][GLib] Replace instances where build path is being added to built artifacts #48026

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
merged 3 commits into from
Nov 3, 2025
Merged

GH-48025: [C++][GLib] Replace instances where build path is being added to built artifacts #48026

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
60314e8
GH-48025: [C++] Replace CMAKE_SOURCE_DIR and CMAKE_BINARY_DIR with co…
raulcd Nov 3, 2025
19faa3b
Replace mkenums @filename@ for @basename@ to stop leaking the build path
raulcd Nov 3, 2025
426f560
Update cpp/src/arrow/util/config_internal.h.cmake
raulcd Nov 3, 2025
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 c_glib/arrow-dataset-glib/enums.c.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

/*** BEGIN file-production ***/

/* enumerations from "@filename@" */
/* enumerations from "@basename@" */
/*** END file-production ***/

/*** BEGIN value-header ***/
Expand Down
2 changes: 1 addition & 1 deletion c_glib/arrow-dataset-glib/enums.h.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ G_BEGIN_DECLS

/*** BEGIN file-production ***/

/* enumerations from "@filename@" */
/* enumerations from "@basename@" */
/*** END file-production ***/

/*** BEGIN value-header ***/
Expand Down
2 changes: 1 addition & 1 deletion c_glib/arrow-glib/enums.c.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

/*** BEGIN file-production ***/

/* enumerations from "@filename@" */
/* enumerations from "@basename@" */
/*** END file-production ***/

/*** BEGIN value-header ***/
Expand Down
2 changes: 1 addition & 1 deletion c_glib/arrow-glib/enums.h.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ G_BEGIN_DECLS

/*** BEGIN file-production ***/

/* enumerations from "@filename@" */
/* enumerations from "@basename@" */
/*** END file-production ***/

/*** BEGIN value-header ***/
Expand Down
2 changes: 1 addition & 1 deletion c_glib/gandiva-glib/enums.c.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

/*** BEGIN file-production ***/

/* enumerations from "@filename@" */
/* enumerations from "@basename@" */
/*** END file-production ***/

/*** BEGIN value-header ***/
Expand Down
2 changes: 1 addition & 1 deletion c_glib/gandiva-glib/enums.h.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ G_BEGIN_DECLS

/*** BEGIN file-production ***/

/* enumerations from "@filename@" */
/* enumerations from "@basename@" */
/*** END file-production ***/

/*** BEGIN value-header ***/
Expand Down
4 changes: 4 additions & 0 deletions cpp/src/arrow/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,10 @@ macro(append_runtime_avx512_src SRCS SRC)
endmacro()

# Write out compile-time configuration constants
string(REPLACE "${CMAKE_SOURCE_DIR}" "<CMAKE_SOURCE_DIR>" REDACTED_CXX_FLAGS
${CMAKE_CXX_FLAGS})
string(REPLACE "${CMAKE_BINARY_DIR}" "<CMAKE_BINARY_DIR>" REDACTED_CXX_FLAGS
${REDACTED_CXX_FLAGS})
configure_file("util/config.h.cmake" "util/config.h" ESCAPE_QUOTES)
configure_file("util/config_internal.h.cmake" "util/config_internal.h" ESCAPE_QUOTES)
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/util/config.h"
Expand Down
1 change: 0 additions & 1 deletion cpp/src/arrow/util/config.h.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@

#define ARROW_CXX_COMPILER_ID "@CMAKE_CXX_COMPILER_ID@"
#define ARROW_CXX_COMPILER_VERSION "@CMAKE_CXX_COMPILER_VERSION@"
#define ARROW_CXX_COMPILER_FLAGS "@CMAKE_CXX_FLAGS@"

#define ARROW_BUILD_TYPE "@UPPERCASE_BUILD_TYPE@"

Expand Down
2 changes: 2 additions & 0 deletions cpp/src/arrow/util/config_internal.h.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,7 @@
// These variables are not exposed as they can make compilation caching
// and increment builds less efficient.

#define ARROW_CXX_COMPILER_FLAGS "@REDACTED_CXX_FLAGS@"

#define ARROW_GIT_ID "@ARROW_GIT_ID@"
#define ARROW_GIT_DESCRIPTION "@ARROW_GIT_DESCRIPTION@"
Loading