Skip to content

Commit 5e73ff0

Browse files
Do some cleaning up.
1 parent 3012760 commit 5e73ff0

File tree

4 files changed

+7
-16
lines changed

4 files changed

+7
-16
lines changed

Projects/CMake/CMakeLists.txt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
cmake_minimum_required (VERSION 3.5)
22

33
set(REPO_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../..)
4-
set(CMAKE_PROJECT_ROOT ${REPO_ROOT}/Projects/CMake)
5-
6-
if(WIN32)
7-
set(INCLUDE_FOLDER_NAME Include)
8-
else()
9-
set(INCLUDE_FOLDER_NAME include)
10-
endif()
114

125
set(CMAKE_CXX_STANDARD 11)
136
set(CMAKE_CXX_STANDARD_REQUIRED, ON)

Projects/CMake/Test/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
project(Test CXX)
22

3-
include_directories(${gtest_SOURCE_DIR}/include ${gtest_SOURCE_DIR})
4-
include_directories(${LOCAL_INCLUDE_DIR})
5-
63
file(GLOB_RECURSE CPP_FILES ${REPO_ROOT}/${PROJECT_NAME}/Source/*.cpp)
74
add_executable(${PROJECT_NAME} ${CPP_FILES})
85
find_package(Threads REQUIRED)
Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
project(WaitFreeRingBufferUtilities)
22

3+
if(WIN32)
4+
set(INCLUDE_FOLDER_NAME Include)
5+
else()
6+
set(INCLUDE_FOLDER_NAME include)
7+
endif()
8+
39
set(LOCAL_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/${INCLUDE_FOLDER_NAME})
410

511
add_custom_target(${PROJECT_NAME}_HEADERS ALL
@@ -11,8 +17,4 @@ target_include_directories(${PROJECT_NAME} INTERFACE ${LOCAL_INCLUDE_DIR})
1117
add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}_HEADERS)
1218
target_link_libraries(${PROJECT_NAME} INTERFACE Boost::optional)
1319

14-
if(WIN32)
15-
install(DIRECTORY ${REPO_ROOT}/${PROJECT_NAME}/Include/ DESTINATION Include/Iyp/${PROJECT_NAME})
16-
else()
17-
install(DIRECTORY ${REPO_ROOT}/${PROJECT_NAME}/Include/ DESTINATION include/Iyp/${PROJECT_NAME})
18-
endif()
20+
install(DIRECTORY ${REPO_ROOT}/${PROJECT_NAME}/Include/ DESTINATION ${INCLUDE_FOLDER_NAME}/Iyp/${PROJECT_NAME})

Test/Source/multi-producer-multi-consumer-test.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ namespace Iyp
1010
{
1111
namespace MultiProducerMultiConsumerRingBufferTest
1212
{
13-
1413
constexpr static std::size_t RingSize = 4096;
1514
using TestRingBufferType = WaitFreeRingBufferUtilities::RingBuffer<std::size_t,
1615
WaitFreeRingBufferUtilities::AccessRequirements::MULTI_CONSUMER |

0 commit comments

Comments
 (0)