diff options
| author | Josh Blum | 2012-04-16 09:18:52 -0700 |
|---|---|---|
| committer | Josh Blum | 2012-04-19 18:12:56 -0700 |
| commit | 4e86843aa236c4fabac35f236f22d16cd8fea99b (patch) | |
| tree | 61cdcf291900d704457f12fc3a62c1681f75e95b /volk/lib | |
| parent | 25a3690954d80819fe59e179e4675c5cdf81a347 (diff) | |
| download | gnuradio-4e86843aa236c4fabac35f236f22d16cd8fea99b.tar.gz gnuradio-4e86843aa236c4fabac35f236f22d16cd8fea99b.tar.bz2 gnuradio-4e86843aa236c4fabac35f236f22d16cd8fea99b.zip | |
volk: python checks and build system stuff
Diffstat (limited to 'volk/lib')
| -rw-r--r-- | volk/lib/CMakeLists.txt | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/volk/lib/CMakeLists.txt b/volk/lib/CMakeLists.txt index 6e80e99e8..06057ff87 100644 --- a/volk/lib/CMakeLists.txt +++ b/volk/lib/CMakeLists.txt @@ -29,6 +29,12 @@ if(HAVE_INTRIN_H) add_definitions(-DHAVE_INTRIN_H) endif() +CHECK_INCLUDE_FILE(dlfcn.h HAVE_DLFCN_H) +if(HAVE_DLFCN_H) + add_definitions(-DHAVE_DLFCN_H) + list(APPEND volk_libraries ${CMAKE_DL_LIBS}) +endif() + ######################################################################## # Setup the compiler name ######################################################################## @@ -76,10 +82,10 @@ endforeach(line) # since ORC always passes flag detection ######################################################################## if(ORC_FOUND) - message(STATUS "Overruled arch not orc") + message(STATUS "Overruled arch !ORC") list(REMOVE_ITEM available_archs norc) else() - message(STATUS "Overruled arch orc") + message(STATUS "Overruled arch ORC") list(REMOVE_ITEM available_archs orc) endif() @@ -132,6 +138,7 @@ endforeach(machine_name) ######################################################################## # Create rules to run the volk generator ######################################################################## + #dependencies are all python, xml, and header implementation files file(GLOB xml_files ${CMAKE_SOURCE_DIR}/gen/*.xml) file(GLOB py_files ${CMAKE_SOURCE_DIR}/gen/*.py) @@ -182,7 +189,7 @@ if(ORC_FOUND) #setup orc library usage include_directories(${ORC_INCLUDE_DIRS}) link_directories(${ORC_LIBRARY_DIRS}) - add_definitions(-DLV_HAVE_ORC) + list(APPEND volk_libraries ${ORC_LIBRARIES}) #setup orc functions file(GLOB orc_files ${CMAKE_SOURCE_DIR}/orc/*.orc) @@ -232,9 +239,7 @@ endif() #create the volk runtime library add_library(volk SHARED ${volk_sources}) -if(ORC_FOUND) - target_link_libraries(volk ${ORC_LIBRARIES}) -endif(ORC_FOUND) +target_link_libraries(volk ${volk_libraries}) set_target_properties(volk PROPERTIES SOVERSION ${LIBVER}) set_target_properties(volk PROPERTIES DEFINE_SYMBOL "volk_EXPORTS") |