summaryrefslogtreecommitdiff
path: root/gruel
diff options
context:
space:
mode:
Diffstat (limited to 'gruel')
-rw-r--r--gruel/CMakeLists.txt32
-rw-r--r--gruel/src/include/gruel/CMakeLists.txt10
-rw-r--r--gruel/src/lib/CMakeLists.txt46
-rw-r--r--gruel/src/lib/msg/CMakeLists.txt2
-rw-r--r--gruel/src/lib/pmt/CMakeLists.txt20
-rw-r--r--gruel/src/python/CMakeLists.txt20
-rw-r--r--gruel/src/scheme/gnuradio/CMakeLists.txt2
-rw-r--r--gruel/src/swig/CMakeLists.txt10
8 files changed, 71 insertions, 71 deletions
diff --git a/gruel/CMakeLists.txt b/gruel/CMakeLists.txt
index 933e74b2f..b33217c14 100644
--- a/gruel/CMakeLists.txt
+++ b/gruel/CMakeLists.txt
@@ -20,20 +20,20 @@
########################################################################
# Setup dependencies
########################################################################
-INCLUDE(GrBoost)
+include(GrBoost)
-INCLUDE(GrPython) #used for code generation
+include(GrPython) #used for code generation
########################################################################
# Register component
########################################################################
-INCLUDE(GrComponent)
+include(GrComponent)
GR_REGISTER_COMPONENT("gruel" ENABLE_GRUEL
Boost_FOUND
PYTHONINTERP_FOUND
)
-INCLUDE(GrMiscUtils)
+include(GrMiscUtils)
GR_SET_GLOBAL(GRUEL_INCLUDE_DIRS
${Boost_INCLUDE_DIRS}
${CMAKE_CURRENT_SOURCE_DIR}/src/include
@@ -43,12 +43,12 @@ GR_SET_GLOBAL(GRUEL_INCLUDE_DIRS
########################################################################
# Begin conditional configuration
########################################################################
-IF(ENABLE_GRUEL)
+if(ENABLE_GRUEL)
########################################################################
# Setup CPack components
########################################################################
-INCLUDE(GrPackage)
+include(GrPackage)
CPACK_SET(CPACK_COMPONENT_GROUP_GRUEL_DESCRIPTION "GNU Radio Utility Etcetera Library")
CPACK_COMPONENT("gruel_runtime"
@@ -80,26 +80,26 @@ CPACK_COMPONENT("gruel_swig"
########################################################################
# Add subdirectories
########################################################################
-ADD_SUBDIRECTORY(src/include/gruel)
-ADD_SUBDIRECTORY(src/scheme/gnuradio)
-ADD_SUBDIRECTORY(src/lib)
-IF(ENABLE_PYTHON)
- ADD_SUBDIRECTORY(src/swig)
- ADD_SUBDIRECTORY(src/python)
-ENDIF(ENABLE_PYTHON)
+add_subdirectory(src/include/gruel)
+add_subdirectory(src/scheme/gnuradio)
+add_subdirectory(src/lib)
+if(ENABLE_PYTHON)
+ add_subdirectory(src/swig)
+ add_subdirectory(src/python)
+endif(ENABLE_PYTHON)
########################################################################
# Create Pkg Config File
########################################################################
-CONFIGURE_FILE(
+configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/gruel.pc.in
${CMAKE_CURRENT_BINARY_DIR}/gruel.pc
@ONLY)
-INSTALL(
+install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/gruel.pc
DESTINATION ${GR_LIBRARY_DIR}/pkgconfig
COMPONENT "gruel_devel"
)
-ENDIF(ENABLE_GRUEL)
+endif(ENABLE_GRUEL)
diff --git a/gruel/src/include/gruel/CMakeLists.txt b/gruel/src/include/gruel/CMakeLists.txt
index 2f80043a4..811856b98 100644
--- a/gruel/src/include/gruel/CMakeLists.txt
+++ b/gruel/src/include/gruel/CMakeLists.txt
@@ -20,15 +20,15 @@
########################################################################
# Generate inet.h header file
########################################################################
-INCLUDE(TestBigEndian)
-ENABLE_LANGUAGE(C)
+include(TestBigEndian)
+enable_language(C)
TEST_BIG_ENDIAN(GR_ARCH_BIGENDIAN)
-INCLUDE(CheckIncludeFileCXX)
+include(CheckIncludeFileCXX)
CHECK_INCLUDE_FILE_CXX(byteswap.h GR_HAVE_BYTESWAP)
CHECK_INCLUDE_FILE_CXX(arpa/inet.h GR_HAVE_ARPA_INET)
-CONFIGURE_FILE(
+configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/inet.h.in
${CMAKE_CURRENT_BINARY_DIR}/inet.h
@ONLY)
@@ -36,7 +36,7 @@ CONFIGURE_FILE(
########################################################################
# Install the headers
########################################################################
-INSTALL(FILES
+install(FILES
api.h
attributes.h
high_res_timer.h
diff --git a/gruel/src/lib/CMakeLists.txt b/gruel/src/lib/CMakeLists.txt
index d078e52f9..b54e644bc 100644
--- a/gruel/src/lib/CMakeLists.txt
+++ b/gruel/src/lib/CMakeLists.txt
@@ -20,13 +20,13 @@
########################################################################
# Include subdirs rather to populate to the sources lists.
########################################################################
-INCLUDE(GrMiscUtils)
-INCLUDE(CheckCXXSourceCompiles)
+include(GrMiscUtils)
+include(CheckCXXSourceCompiles)
GR_CHECK_HDR_N_DEF(signal.h HAVE_SIGNAL_H)
GR_CHECK_HDR_N_DEF(sched.h HAVE_SCHED_H)
-SET(CMAKE_REQUIRED_LIBRARIES -lpthread)
+set(CMAKE_REQUIRED_LIBRARIES -lpthread)
CHECK_CXX_SOURCE_COMPILES("
#include <signal.h>
int main(){pthread_sigmask(0, 0, 0); return 0;}
@@ -34,7 +34,7 @@ CHECK_CXX_SOURCE_COMPILES("
)
GR_ADD_COND_DEF(HAVE_PTHREAD_SIGMASK)
-SET(CMAKE_REQUIRED_LIBRARIES -lpthread)
+set(CMAKE_REQUIRED_LIBRARIES -lpthread)
CHECK_CXX_SOURCE_COMPILES("
#include <pthread.h>
int main(){
@@ -64,28 +64,28 @@ GR_INCLUDE_SUBDIRECTORY(pmt)
########################################################################
# Setup the include and linker paths
########################################################################
-INCLUDE_DIRECTORIES(${GRUEL_INCLUDE_DIRS})
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(${GRUEL_INCLUDE_DIRS})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
-LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
+include_directories(${Boost_INCLUDE_DIRS})
+link_directories(${Boost_LIBRARY_DIRS})
########################################################################
# Setup library
########################################################################
-LIST(APPEND gruel_sources
+list(APPEND gruel_sources
realtime.cc
sys_pri.cc
thread_body_wrapper.cc
thread_group.cc
)
-ADD_LIBRARY(gruel SHARED ${gruel_sources})
-TARGET_LINK_LIBRARIES(gruel ${Boost_LIBRARIES})
-SET_TARGET_PROPERTIES(gruel PROPERTIES DEFINE_SYMBOL "gruel_EXPORTS")
-SET_TARGET_PROPERTIES(gruel PROPERTIES SOVERSION ${LIBVER})
+add_library(gruel SHARED ${gruel_sources})
+target_link_libraries(gruel ${Boost_LIBRARIES})
+set_target_properties(gruel PROPERTIES DEFINE_SYMBOL "gruel_EXPORTS")
+set_target_properties(gruel PROPERTIES SOVERSION ${LIBVER})
-INSTALL(TARGETS gruel
+install(TARGETS gruel
LIBRARY DESTINATION ${GR_LIBRARY_DIR} COMPONENT "gruel_runtime" # .so/.dylib file
ARCHIVE DESTINATION ${GR_LIBRARY_DIR} COMPONENT "gruel_devel" # .lib file
RUNTIME DESTINATION ${GR_RUNTIME_DIR} COMPONENT "gruel_runtime" # .dll file
@@ -95,16 +95,16 @@ INSTALL(TARGETS gruel
# Setup tests
# Set the test environment so the build libs will be found under MSVC.
########################################################################
-IF(ENABLE_TESTING)
+if(ENABLE_TESTING)
-INCLUDE_DIRECTORIES(${CPPUNIT_INCLUDE_DIRS})
-LINK_DIRECTORIES(${CPPUNIT_LIBRARY_DIRS})
+include_directories(${CPPUNIT_INCLUDE_DIRS})
+link_directories(${CPPUNIT_LIBRARY_DIRS})
-INCLUDE(GrTest)
-SET(GR_TEST_TARGET_DEPS gruel)
-LIST(APPEND test_gruel_sources test_gruel.cc)
-ADD_EXECUTABLE(test_gruel ${test_gruel_sources})
-TARGET_LINK_LIBRARIES(test_gruel gruel ${CPPUNIT_LIBRARIES})
+include(GrTest)
+set(GR_TEST_TARGET_DEPS gruel)
+list(APPEND test_gruel_sources test_gruel.cc)
+add_executable(test_gruel ${test_gruel_sources})
+target_link_libraries(test_gruel gruel ${CPPUNIT_LIBRARIES})
GR_ADD_TEST(gruel-test test_gruel)
-ENDIF(ENABLE_TESTING)
+endif(ENABLE_TESTING)
diff --git a/gruel/src/lib/msg/CMakeLists.txt b/gruel/src/lib/msg/CMakeLists.txt
index 877cc2909..116d2c67f 100644
--- a/gruel/src/lib/msg/CMakeLists.txt
+++ b/gruel/src/lib/msg/CMakeLists.txt
@@ -21,7 +21,7 @@
# This file included, use CMake directory variables
########################################################################
-LIST(APPEND gruel_sources
+list(APPEND gruel_sources
${CMAKE_CURRENT_SOURCE_DIR}/msg_accepter.cc
${CMAKE_CURRENT_SOURCE_DIR}/msg_accepter_msgq.cc
${CMAKE_CURRENT_SOURCE_DIR}/msg_queue.cc
diff --git a/gruel/src/lib/pmt/CMakeLists.txt b/gruel/src/lib/pmt/CMakeLists.txt
index 797db475a..a708fa7ad 100644
--- a/gruel/src/lib/pmt/CMakeLists.txt
+++ b/gruel/src/lib/pmt/CMakeLists.txt
@@ -20,21 +20,21 @@
########################################################################
# This file included, use CMake directory variables
########################################################################
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
########################################################################
# Generate serial tags header file
########################################################################
-GET_FILENAME_COMPONENT(SCHEME_DIR
+get_filename_component(SCHEME_DIR
${CMAKE_CURRENT_SOURCE_DIR}/../../scheme/gnuradio ABSOLUTE
)
-GET_FILENAME_COMPONENT(PMT_SERIAL_TAGS_H
+get_filename_component(PMT_SERIAL_TAGS_H
${CMAKE_CURRENT_BINARY_DIR}/../../include/gruel/pmt_serial_tags.h ABSOLUTE
)
-ADD_CUSTOM_COMMAND(
+add_custom_command(
OUTPUT ${PMT_SERIAL_TAGS_H}
DEPENDS ${SCHEME_DIR}/gen-serial-tags.py
DEPENDS ${SCHEME_DIR}/pmt-serial-tags.scm
@@ -44,13 +44,13 @@ ADD_CUSTOM_COMMAND(
${PMT_SERIAL_TAGS_H}
)
-INSTALL(
+install(
FILES ${PMT_SERIAL_TAGS_H}
DESTINATION ${GR_INCLUDE_DIR}/gruel
COMPONENT "gruel_devel"
)
-INCLUDE(AddFileDependencies)
+include(AddFileDependencies)
ADD_FILE_DEPENDENCIES(
${CMAKE_CURRENT_SOURCE_DIR}/pmt_serialize.cc
${PMT_SERIAL_TAGS_H}
@@ -59,7 +59,7 @@ ADD_FILE_DEPENDENCIES(
########################################################################
# Generate other pmt stuff
########################################################################
-ADD_CUSTOM_COMMAND(
+add_custom_command(
OUTPUT
${CMAKE_CURRENT_BINARY_DIR}/pmt_unv_int.h
${CMAKE_CURRENT_BINARY_DIR}/qa_pmt_unv.h
@@ -75,7 +75,7 @@ ADD_CUSTOM_COMMAND(
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
)
-LIST(APPEND gruel_sources
+list(APPEND gruel_sources
${CMAKE_CURRENT_BINARY_DIR}/pmt_unv.cc
${CMAKE_CURRENT_SOURCE_DIR}/pmt.cc
${CMAKE_CURRENT_SOURCE_DIR}/pmt_io.cc
@@ -83,7 +83,7 @@ LIST(APPEND gruel_sources
${CMAKE_CURRENT_SOURCE_DIR}/pmt_serialize.cc
)
-LIST(APPEND test_gruel_sources
+list(APPEND test_gruel_sources
${CMAKE_CURRENT_BINARY_DIR}/qa_pmt_unv.cc
${CMAKE_CURRENT_SOURCE_DIR}/qa_pmt_prims.cc
${CMAKE_CURRENT_SOURCE_DIR}/qa_pmt.cc
diff --git a/gruel/src/python/CMakeLists.txt b/gruel/src/python/CMakeLists.txt
index 491763cd7..be5ac956e 100644
--- a/gruel/src/python/CMakeLists.txt
+++ b/gruel/src/python/CMakeLists.txt
@@ -17,7 +17,7 @@
# the Free Software Foundation, Inc., 51 Franklin Street,
# Boston, MA 02110-1301, USA.
-INCLUDE(GrPython)
+include(GrPython)
########################################################################
# Install python files
@@ -37,16 +37,16 @@ GR_PYTHON_INSTALL(
########################################################################
# Setup unit tests
########################################################################
-IF(ENABLE_TESTING)
-INCLUDE(GrTest)
-FILE(GLOB py_qa_test_files "qa_*.py")
-FOREACH(py_qa_test_file ${py_qa_test_files})
- GET_FILENAME_COMPONENT(py_qa_test_name ${py_qa_test_file} NAME_WE)
- SET(GR_TEST_PYTHON_DIRS
+if(ENABLE_TESTING)
+include(GrTest)
+file(GLOB py_qa_test_files "qa_*.py")
+foreach(py_qa_test_file ${py_qa_test_files})
+ get_filename_component(py_qa_test_name ${py_qa_test_file} NAME_WE)
+ set(GR_TEST_PYTHON_DIRS
${CMAKE_BINARY_DIR}/gruel/src/python
${CMAKE_BINARY_DIR}/gruel/src/swig
)
- SET(GR_TEST_TARGET_DEPS gruel gnuradio-core)
+ set(GR_TEST_TARGET_DEPS gruel gnuradio-core)
GR_ADD_TEST(${py_qa_test_name} ${PYTHON_EXECUTABLE} ${py_qa_test_file})
-ENDFOREACH(py_qa_test_file)
-ENDIF(ENABLE_TESTING)
+endforeach(py_qa_test_file)
+endif(ENABLE_TESTING)
diff --git a/gruel/src/scheme/gnuradio/CMakeLists.txt b/gruel/src/scheme/gnuradio/CMakeLists.txt
index bfa2a415f..4ff4f7feb 100644
--- a/gruel/src/scheme/gnuradio/CMakeLists.txt
+++ b/gruel/src/scheme/gnuradio/CMakeLists.txt
@@ -19,7 +19,7 @@
########################################################################
-INSTALL(FILES
+install(FILES
pmt-serial-tags.scm
pmt-serialize.scm
macros-etc.scm
diff --git a/gruel/src/swig/CMakeLists.txt b/gruel/src/swig/CMakeLists.txt
index 5b256a793..c2769ae27 100644
--- a/gruel/src/swig/CMakeLists.txt
+++ b/gruel/src/swig/CMakeLists.txt
@@ -20,11 +20,11 @@
########################################################################
# Setup swig generation
########################################################################
-INCLUDE(GrPython)
-INCLUDE(GrSwig)
+include(GrPython)
+include(GrSwig)
-SET(GR_SWIG_INCLUDE_DIRS ${GRUEL_INCLUDE_DIRS})
-SET(GR_SWIG_LIBRARIES gruel)
+set(GR_SWIG_INCLUDE_DIRS ${GRUEL_INCLUDE_DIRS})
+set(GR_SWIG_LIBRARIES gruel)
GR_SWIG_MAKE(pmt_swig pmt_swig.i)
@@ -34,7 +34,7 @@ GR_SWIG_INSTALL(
COMPONENT "gruel_python"
)
-INSTALL(
+install(
FILES gr_intrusive_ptr.i pmt_swig.i
DESTINATION ${GR_INCLUDE_DIR}/gnuradio/swig
COMPONENT "gruel_swig"
generated by cgit (git 2.34.1) at 2024-12-20 16:19:43 +0000