summaryrefslogtreecommitdiff
path: root/grc
diff options
context:
space:
mode:
Diffstat (limited to 'grc')
-rw-r--r--grc/CMakeLists.txt52
-rw-r--r--grc/base/CMakeLists.txt2
-rw-r--r--grc/blocks/CMakeLists.txt4
-rw-r--r--grc/freedesktop/CMakeLists.txt16
-rw-r--r--grc/python/CMakeLists.txt2
5 files changed, 38 insertions, 38 deletions
diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt
index eec35d27c..cc7696210 100644
--- a/grc/CMakeLists.txt
+++ b/grc/CMakeLists.txt
@@ -20,7 +20,7 @@
########################################################################
# Setup dependencies
########################################################################
-INCLUDE(GrPython)
+include(GrPython)
GR_PYTHON_CHECK_MODULE("python >= 2.5" sys "sys.version.split()[0] >= '2.5'" PYTHON_MIN_VER_FOUND)
GR_PYTHON_CHECK_MODULE("Cheetah >= 2.0.0" Cheetah "Cheetah.Version >= '2.0.0'" CHEETAH_FOUND)
@@ -31,15 +31,15 @@ GR_PYTHON_CHECK_MODULE("numpy" numpy True
########################################################################
# Register component
########################################################################
-INCLUDE(GrComponent)
-IF(NOT CMAKE_CROSSCOMPILING)
- SET(grc_python_deps
+include(GrComponent)
+if(NOT CMAKE_CROSSCOMPILING)
+ set(grc_python_deps
CHEETAH_FOUND
LXML_FOUND
PYGTK_FOUND
NUMPY_FOUND
)
-ENDIF(NOT CMAKE_CROSSCOMPILING)
+endif(NOT CMAKE_CROSSCOMPILING)
GR_REGISTER_COMPONENT("gnuradio-companion" ENABLE_GRC
ENABLE_GR_CORE_
@@ -51,12 +51,12 @@ GR_REGISTER_COMPONENT("gnuradio-companion" ENABLE_GRC
########################################################################
# Begin conditional configuration
########################################################################
-IF(ENABLE_GRC)
+if(ENABLE_GRC)
########################################################################
# Setup CPack components
########################################################################
-INCLUDE(GrPackage)
+include(GrPackage)
CPACK_COMPONENT("grc"
DISPLAY_NAME "GNU Radio Companion"
DESCRIPTION "Graphical flow graph designer"
@@ -66,15 +66,15 @@ CPACK_COMPONENT("grc"
########################################################################
# Create and install the grc conf file
########################################################################
-FILE(TO_NATIVE_PATH ${CMAKE_INSTALL_PREFIX}/${GR_PKG_DOC_DIR} docdir)
-FILE(TO_NATIVE_PATH ${CMAKE_INSTALL_PREFIX}/${GRC_BLOCKS_DIR} blocksdir)
+file(TO_NATIVE_PATH ${CMAKE_INSTALL_PREFIX}/${GR_PKG_DOC_DIR} docdir)
+file(TO_NATIVE_PATH ${CMAKE_INSTALL_PREFIX}/${GRC_BLOCKS_DIR} blocksdir)
-CONFIGURE_FILE(
+configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/grc.conf.in
${CMAKE_CURRENT_BINARY_DIR}/grc.conf
@ONLY)
-INSTALL(
+install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/grc.conf
DESTINATION ${GR_PKG_CONF_DIR}
COMPONENT "grc"
@@ -89,14 +89,14 @@ GR_PYTHON_INSTALL(
########################################################################
# Appens NSIS commands to set environment variables
########################################################################
-FILE(TO_NATIVE_PATH ${GR_PKG_DOC_DIR} GR_DOC_DIR)
-STRING(REPLACE "\\" "\\\\" GR_DOC_DIR ${GR_DOC_DIR})
+file(TO_NATIVE_PATH ${GR_PKG_DOC_DIR} GR_DOC_DIR)
+string(REPLACE "\\" "\\\\" GR_DOC_DIR ${GR_DOC_DIR})
-FILE(TO_NATIVE_PATH ${GRC_BLOCKS_DIR} GRC_BLOCKS_PATH)
-STRING(REPLACE "\\" "\\\\" GRC_BLOCKS_PATH ${GRC_BLOCKS_PATH})
+file(TO_NATIVE_PATH ${GRC_BLOCKS_DIR} GRC_BLOCKS_PATH)
+string(REPLACE "\\" "\\\\" GRC_BLOCKS_PATH ${GRC_BLOCKS_PATH})
-FILE(TO_NATIVE_PATH ${GR_PYTHON_DIR} GR_PYTHON_POSTFIX)
-STRING(REPLACE "\\" "\\\\" GR_PYTHON_POSTFIX ${GR_PYTHON_POSTFIX})
+file(TO_NATIVE_PATH ${GR_PYTHON_DIR} GR_PYTHON_POSTFIX)
+string(REPLACE "\\" "\\\\" GR_PYTHON_POSTFIX ${GR_PYTHON_POSTFIX})
CPACK_SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "${CPACK_NSIS_EXTRA_INSTALL_COMMANDS}
WriteRegStr HKLM ${HLKM_ENV} \\\"GR_DOC_DIR\\\" \\\"$INSTDIR\\\\${GR_DOC_DIR}\\\"
@@ -113,12 +113,12 @@ CPACK_SET(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "${CPACK_NSIS_EXTRA_UNINSTALL_COMM
########################################################################
# Add subdirectories
########################################################################
-ADD_SUBDIRECTORY(base)
-ADD_SUBDIRECTORY(blocks)
-ADD_SUBDIRECTORY(freedesktop)
-ADD_SUBDIRECTORY(grc_gnuradio)
-ADD_SUBDIRECTORY(gui)
-ADD_SUBDIRECTORY(python)
-ADD_SUBDIRECTORY(scripts)
-
-ENDIF(ENABLE_GRC)
+add_subdirectory(base)
+add_subdirectory(blocks)
+add_subdirectory(freedesktop)
+add_subdirectory(grc_gnuradio)
+add_subdirectory(gui)
+add_subdirectory(python)
+add_subdirectory(scripts)
+
+endif(ENABLE_GRC)
diff --git a/grc/base/CMakeLists.txt b/grc/base/CMakeLists.txt
index 81d39e69c..c6d6a09eb 100644
--- a/grc/base/CMakeLists.txt
+++ b/grc/base/CMakeLists.txt
@@ -34,7 +34,7 @@ GR_PYTHON_INSTALL(FILES
COMPONENT "grc"
)
-INSTALL(FILES
+install(FILES
block_tree.dtd
flow_graph.dtd
DESTINATION ${GR_PYTHON_DIR}/gnuradio/grc/base
diff --git a/grc/blocks/CMakeLists.txt b/grc/blocks/CMakeLists.txt
index 393a91b27..ad31b0975 100644
--- a/grc/blocks/CMakeLists.txt
+++ b/grc/blocks/CMakeLists.txt
@@ -18,5 +18,5 @@
# Boston, MA 02110-1301, USA.
########################################################################
-FILE(GLOB xml_files "*.xml")
-INSTALL(FILES ${xml_files} DESTINATION ${GRC_BLOCKS_DIR} COMPONENT "grc")
+file(GLOB xml_files "*.xml")
+install(FILES ${xml_files} DESTINATION ${GRC_BLOCKS_DIR} COMPONENT "grc")
diff --git a/grc/freedesktop/CMakeLists.txt b/grc/freedesktop/CMakeLists.txt
index 2e74dd3be..8c0f53d9f 100644
--- a/grc/freedesktop/CMakeLists.txt
+++ b/grc/freedesktop/CMakeLists.txt
@@ -18,9 +18,9 @@
# Boston, MA 02110-1301, USA.
########################################################################
-SET(grc_freedesktop_path ${GR_PKG_DATA_DIR}/grc/freedesktop)
+set(grc_freedesktop_path ${GR_PKG_DATA_DIR}/grc/freedesktop)
-INSTALL(FILES
+install(FILES
grc-icon-256.png
grc-icon-128.png
grc-icon-64.png
@@ -32,16 +32,16 @@ INSTALL(FILES
COMPONENT "grc"
)
-FIND_PROGRAM(HAVE_XDG_UTILS xdg-desktop-menu)
+find_program(HAVE_XDG_UTILS xdg-desktop-menu)
-IF(UNIX AND HAVE_XDG_UTILS)
- SET(SRCDIR ${CMAKE_INSTALL_PREFIX}/${grc_freedesktop_path})
- CONFIGURE_FILE(
+if(UNIX AND HAVE_XDG_UTILS)
+ set(SRCDIR ${CMAKE_INSTALL_PREFIX}/${grc_freedesktop_path})
+ configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/grc_setup_freedesktop.in
${CMAKE_CURRENT_BINARY_DIR}/grc_setup_freedesktop
@ONLY)
- INSTALL(
+ install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/grc_setup_freedesktop
DESTINATION ${GR_PKG_LIBEXEC_DIR} COMPONENT "grc"
)
-ENDIF(UNIX AND HAVE_XDG_UTILS)
+endif(UNIX AND HAVE_XDG_UTILS)
diff --git a/grc/python/CMakeLists.txt b/grc/python/CMakeLists.txt
index 50ec6d0ba..2075d126d 100644
--- a/grc/python/CMakeLists.txt
+++ b/grc/python/CMakeLists.txt
@@ -36,7 +36,7 @@ GR_PYTHON_INSTALL(FILES
COMPONENT "grc"
)
-INSTALL(FILES
+install(FILES
block.dtd
default_flow_graph.grc
flow_graph.tmpl
generated by cgit (git 2.34.1) at 2024-12-20 16:10:06 +0000