summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rondeau <trondeau@vt.edu>2013-04-02 14:08:32 -0400
committerTom Rondeau <trondeau@vt.edu>2013-04-02 14:14:47 -0400
commit7764dda1fa470c58811e4993ccfce9da85e8f648 (patch)
treee0f3a3f99cf99230bce36e666977e429961d707b
parent6e15fa1ab7a88ee843e0d898c0f39e732c3b144f (diff)
build: rename config.h to less ambiguous gr_config.h (for 3.6 only; will be config.h in 3.7).
-rw-r--r--CMakeLists.txt10
-rw-r--r--gr_config.h.in (renamed from config.h.in)0
2 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 44086f6549..14be392eb1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -299,16 +299,16 @@ GR_PRINT_COMPONENT_SUMMARY()
message(STATUS "Using install prefix: ${CMAKE_INSTALL_PREFIX}")
message(STATUS "Building for version: ${VERSION} / ${LIBVER}")
-# Create a config.h with some definitions to export to other projects.
+# Create a gr_config.h with some definitions to export to other projects.
CONFIGURE_FILE(
- ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
- ${CMAKE_CURRENT_BINARY_DIR}/config.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/gr_config.h.in
+ ${CMAKE_CURRENT_BINARY_DIR}/gr_config.h
)
-# Install config.h in include/gnuradio
+# Install gr_config.h in include/gnuradio
install(
FILES
- ${CMAKE_CURRENT_BINARY_DIR}/config.h
+ ${CMAKE_CURRENT_BINARY_DIR}/gr_config.h
DESTINATION ${GR_INCLUDE_DIR}/gnuradio
COMPONENT "core_devel"
)
diff --git a/config.h.in b/gr_config.h.in
index 2a2141b3d5..2a2141b3d5 100644
--- a/config.h.in
+++ b/gr_config.h.in