From 7f13372f7a269b80a739347dcb9836f6c9166d4e Mon Sep 17 00:00:00 2001
From: Ivan Maidanski <ivmai@mail.ru>
Date: Wed, 24 Aug 2022 09:26:04 +0300
Subject: Do not use include_directories(src) in CMakeLists.txt (refactoring)

* CMakeLists.txt (src): Remove include_directories specification.
* CMakeLists.txt (atomic_ops): Specify path to "src" as public.
* CMakeLists.txt [enable_gpl] (atomic_ops_gpl): Likewise.
---
 CMakeLists.txt | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 773413c..27c6500 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -88,8 +88,6 @@ else()
   add_compile_options(-Wall -Wextra)
 endif()
 
-include_directories(src)
-
 find_package(Threads REQUIRED)
 message(STATUS "Thread library: ${CMAKE_THREAD_LIBS_INIT}")
 include_directories(${Threads_INCLUDE_DIR})
@@ -144,9 +142,9 @@ endif()
 
 add_library(atomic_ops ${SRC})
 target_link_libraries(atomic_ops PRIVATE ${THREADDLLIBS_LIST})
-target_include_directories(atomic_ops INTERFACE
-        "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>"
-        "$<INSTALL_INTERFACE:include>")
+target_include_directories(atomic_ops
+                PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>"
+                INTERFACE "$<INSTALL_INTERFACE:include>")
 
 if (enable_gpl)
   set(AO_GPL_SRC src/atomic_ops_malloc.c src/atomic_ops_stack.c)
@@ -156,9 +154,9 @@ if (enable_gpl)
     target_compile_definitions(atomic_ops_gpl PRIVATE HAVE_MMAP)
   endif()
   target_link_libraries(atomic_ops_gpl PRIVATE atomic_ops)
-  target_include_directories(atomic_ops_gpl INTERFACE
-        "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>"
-        "$<INSTALL_INTERFACE:include>")
+  target_include_directories(atomic_ops_gpl
+                PUBLIC "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>"
+                INTERFACE "$<INSTALL_INTERFACE:include>")
   if (BUILD_SHARED_LIBS)
     set_property(TARGET atomic_ops_gpl PROPERTY VERSION ${AO_GPL_VERSION_PROP})
     set_property(TARGET atomic_ops_gpl PROPERTY SOVERSION ${AO_GPL_SOVERSION})
-- 
cgit v1.2.1