diff options
| author | Piotr Krysik <ptrkrysik@gmail.com> | 2018-06-19 12:07:28 +0200 |
|---|---|---|
| committer | Piotr Krysik <ptrkrysik@gmail.com> | 2018-06-19 12:07:28 +0200 |
| commit | ac140210c93deb8918f7ab964c2ba8791aea711e (patch) | |
| tree | 9b2e3f6bf557316987e0187c5d5c528a50a5dcf7 | |
| parent | e153e729cda853c432fb8f5edcf73f16d271067e (diff) | |
Simplify cmake checks related to libosmocore
| -rw-r--r-- | CMakeLists.txt | 10 | ||||
| -rw-r--r-- | cmake/Modules/GrccCompile.cmake | 2 | ||||
| -rw-r--r-- | lib/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | lib/decoding/CMakeLists.txt | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index bfbfe1a..16625f2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -155,13 +155,13 @@ endif() if(NOT CPPUNIT_FOUND) message(FATAL_ERROR "CppUnit required to compile gr-gsm") endif() + +if(NOT LIBOSMOCORE_FOUND OR NOT LIBOSMOCODEC_FOUND OR NOT LIBOSMOGSM_FOUND) + set(LOCAL_OSMOCOM ON) +endif() + if(LOCAL_OSMOCOM) message(STATUS "Compiling with local osmocom libraries") - unset(LIBOSMOCORE_FOUND) - unset(LIBOSMOCODEC_FOUND) - unset(LIBOSMOCODING_FOUND) -elseif(NOT LIBOSMOCORE_FOUND OR NOT LIBOSMOCODEC_FOUND) - message(STATUS "Compiling local version of libosmocore") elseif(NOT LIBOSMOCODING_FOUND) message(STATUS "Compiling local version of libosmocoding") endif() diff --git a/cmake/Modules/GrccCompile.cmake b/cmake/Modules/GrccCompile.cmake index bcb1b38..4a917c5 100644 --- a/cmake/Modules/GrccCompile.cmake +++ b/cmake/Modules/GrccCompile.cmake @@ -48,7 +48,7 @@ macro(GRCC_COMPILE file_name) COMMAND "${CMAKE_COMMAND}" -E rename ${CMAKE_CURRENT_BINARY_DIR}/${file_name}.py ${CMAKE_CURRENT_BINARY_DIR}/${file_name} DEPENDS ${file_name}.grc ) - endif() + endif() endmacro(GRCC_COMPILE) ######################################################################## diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 5fa9da4..0f2c629 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -88,7 +88,7 @@ if(WIN32) list (APPEND grgsm_link_libraries ws2_32) endif() -if(LIBOSMOCORE_FOUND AND LIBOSMOCODEC_FOUND AND LIBOSMOGSM_FOUND) +if(NOT LOCAL_OSMOCOM) list (APPEND grgsm_link_libraries ${LIBOSMOCORE_LIBRARIES} ${LIBOSMOCODEC_LIBRARIES} ${LIBOSMOGSM_LIBRARY}) if(LIBOSMOCODING_FOUND) list (APPEND grgsm_link_libraries ${LIBOSMOCODING_LIBRARIES}) diff --git a/lib/decoding/CMakeLists.txt b/lib/decoding/CMakeLists.txt index 95071ab..154108a 100644 --- a/lib/decoding/CMakeLists.txt +++ b/lib/decoding/CMakeLists.txt @@ -17,7 +17,7 @@ # the Free Software Foundation, Inc., 51 Franklin Street, # Boston, MA 02110-1301, USA. -if(NOT LIBOSMOCORE_FOUND OR NOT LIBOSMOCODEC_FOUND OR NOT LIBOSMOGSM_FOUND) +if(LOCAL_OSMOCOM) add_subdirectory(osmocom/core) add_subdirectory(osmocom/codec) add_subdirectory(osmocom/gsm) |