cmake: fix include_directories paths

Some paths still contained srsgnb.

Author: dvdgrgrtt

lib/phy/upper/channel_coding/CMakeLists.txt

@@ -6,7 +6,7 @@
 # the distribution.
 #
 
-include_directories(${PROJECT_SOURCE_DIR}/include/srsgnb/phy/upper/channel_coding)
+include_directories(${PROJECT_SOURCE_DIR}/include/srsran/phy/upper/channel_coding)
 
 set(CRC_CALCULATOR_SOURCES crc_calculator_lut_impl.cpp)
 if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64")

lib/phy/upper/channel_coding/ldpc/CMakeLists.txt

@@ -6,7 +6,7 @@
 # the distribution.
 #
 
-include_directories(${PROJECT_SOURCE_DIR}/include/srsgnb/phy/upper/channel_coding/ldpc)
+include_directories(${PROJECT_SOURCE_DIR}/include/srsran/phy/upper/channel_coding/ldpc)
 
 set(ldpc_sources
         ldpc_graph_impl.cpp
@@ -36,11 +36,11 @@ if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64")
     set_source_files_properties(ldpc_rate_dematcher_avx512_impl.cpp PROPERTIES COMPILE_OPTIONS "-mavx512f;-mavx512bw;")
 endif (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64")
 
-if(HAVE_NEON)
-  list(APPEND ldpc_sources ldpc_encoder_neon.cpp)
-  list(APPEND ldpc_sources ldpc_decoder_neon.cpp)
-  list(APPEND ldpc_sources ldpc_rate_dematcher_neon_impl.cpp)
-endif(HAVE_NEON)
+if (HAVE_NEON)
+    list(APPEND ldpc_sources ldpc_encoder_neon.cpp)
+    list(APPEND ldpc_sources ldpc_decoder_neon.cpp)
+    list(APPEND ldpc_sources ldpc_rate_dematcher_neon_impl.cpp)
+endif (HAVE_NEON)
 
 add_library(srsran_ldpc STATIC ${ldpc_sources})
 

lib/phy/upper/channel_coding/polar/CMakeLists.txt

@@ -6,7 +6,7 @@
 # the distribution.
 #
 
-include_directories(${PROJECT_SOURCE_DIR}/include/srsgnb/phy/upper/channel_coding/polar)
+include_directories(${PROJECT_SOURCE_DIR}/include/srsran/phy/upper/channel_coding/polar)
 
 add_library(srsran_polar STATIC
         polar_allocator_impl.cpp
@@ -17,5 +17,5 @@ add_library(srsran_polar STATIC
         polar_interleaver_impl.cpp
         polar_rate_dematcher_impl.cpp
         polar_rate_matcher_impl.cpp
-)
+        )
 target_link_libraries(srsran_polar log_likelihood_ratio srslog)

lib/phy/upper/channel_coding/short/CMakeLists.txt

@@ -1,3 +1,3 @@
-include_directories(${PROJECT_SOURCE_DIR}/include/srsgnb/phy/upper/channel_coding/short)
+include_directories(${PROJECT_SOURCE_DIR}/include/srsran/phy/upper/channel_coding/short)
 add_library(srsran_short_block STATIC short_block_encoder_impl.cpp short_block_detector_impl.cpp)
 target_link_libraries(srsran_short_block srsran_support log_likelihood_ratio srsvec)

lib/phy/upper/channel_modulation/CMakeLists.txt

@@ -16,7 +16,7 @@ set(SOURCES
         evm_calculator_generic_impl.cpp
         modulation_mapper_impl.cpp)
 
-include_directories(../../../../include/srsgnb/phy/upper/channel_modulation)
+include_directories(../../../../include/srsran/phy/upper/channel_modulation)
 
 add_library(srsran_channel_modulation STATIC ${SOURCES})
 target_link_libraries(srsran_channel_modulation srsran_support log_likelihood_ratio)

lib/phy/upper/sequence_generators/CMakeLists.txt

@@ -13,7 +13,7 @@ set(SOURCES
         sequence_generator_factories.cpp
         )
 
-include_directories(../../../../include/srsgnb/phy/upper/sequence_generators)
+include_directories(../../../../include/srsran/phy/upper/sequence_generators)
 
 add_library(srsran_sequence_generators STATIC ${SOURCES})
 target_link_libraries(srsran_sequence_generators srsran_support srsvec)

lib/phy/upper/signal_processors/CMakeLists.txt

@@ -20,7 +20,7 @@ set(SOURCES
         sss_processor_impl.cpp
         )
 
-include_directories(../../../../include/srsgnb/phy/upper/signal_processors)
+include_directories(../../../../include/srsran/phy/upper/signal_processors)
 
 add_library(srsran_signal_processors STATIC ${SOURCES})
 target_link_libraries(srsran_signal_processors srsvec srsran_phy_support srsran_upper_phy_support srsran_ran srsran_generic_funcs)

lib/srslog/CMakeLists.txt

@@ -7,18 +7,18 @@
 #
 
 set(SOURCES
-    backend_worker.cpp
-    srslog.cpp
-    srslog_c.cpp
-    event_trace.cpp)
+        backend_worker.cpp
+        srslog.cpp
+        srslog_c.cpp
+        event_trace.cpp)
 
-include_directories(${PROJECT_SOURCE_DIR}/include/srsgnb/srslog/bundled/)
-include_directories(${PROJECT_SOURCE_DIR}/include/srsgnb/srslog/formatters)
+include_directories(${PROJECT_SOURCE_DIR}/include/srsran/srslog/bundled/)
+include_directories(${PROJECT_SOURCE_DIR}/include/srsran/srslog/formatters)
 
 set(SOURCES
-    ${SOURCES}
-    ${CMAKE_CURRENT_SOURCE_DIR}/formatters/json_formatter.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/formatters/text_formatter.cpp)
+        ${SOURCES}
+        ${CMAKE_CURRENT_SOURCE_DIR}/formatters/json_formatter.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/formatters/text_formatter.cpp)
 
 
 add_library(srslog STATIC ${SOURCES})

lib/srsvec/CMakeLists.txt

@@ -19,7 +19,7 @@ set(SOURCES
         subtract.cpp
         )
 
-include_directories(${PROJECT_SOURCE_DIR}/include/srsgnb/srsvec)
+include_directories(${PROJECT_SOURCE_DIR}/include/srsran/srsvec)
 
 add_library(srsvec STATIC ${SOURCES})
 target_link_libraries(srsvec srslog)