move UUID into a submodule
This commit is contained in:
parent
a8377b6635
commit
2f1d29ecfa
|
@ -104,7 +104,7 @@ FILE_VERSION_FILTER =
|
||||||
LAYOUT_FILE =
|
LAYOUT_FILE =
|
||||||
CITE_BIB_FILES = @CMAKE_CURRENT_SOURCE_DIR@/protocol/artistic/ARTISTIC.bib \
|
CITE_BIB_FILES = @CMAKE_CURRENT_SOURCE_DIR@/protocol/artistic/ARTISTIC.bib \
|
||||||
@CMAKE_CURRENT_SOURCE_DIR@/ESTA.bib \
|
@CMAKE_CURRENT_SOURCE_DIR@/ESTA.bib \
|
||||||
@CMAKE_CURRENT_SOURCE_DIR@/IETF.bib
|
@CMAKE_CURRENT_SOURCE_DIR@/protocol/ietf/IETF.bib
|
||||||
#---------------------------------------------------------------------------
|
#---------------------------------------------------------------------------
|
||||||
# Configuration options related to warning and progress messages
|
# Configuration options related to warning and progress messages
|
||||||
#---------------------------------------------------------------------------
|
#---------------------------------------------------------------------------
|
||||||
|
|
|
@ -30,9 +30,17 @@ include(rdmnet/CMakeLists.txt)
|
||||||
# E1.56
|
# E1.56
|
||||||
include(otp/CMakeLists.txt)
|
include(otp/CMakeLists.txt)
|
||||||
|
|
||||||
# Art-Net 4
|
# Internet Engineering Task Force
|
||||||
|
add_subdirectory(ietf)
|
||||||
|
|
||||||
|
# Artistic License
|
||||||
add_subdirectory(artistic)
|
add_subdirectory(artistic)
|
||||||
|
|
||||||
|
target_link_libraries(${PROJECT_NAME}
|
||||||
|
PUBLIC
|
||||||
|
LCP_ietf_uuid
|
||||||
|
)
|
||||||
|
|
||||||
set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${PROJECT_VERSION})
|
set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${PROJECT_VERSION})
|
||||||
set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION ${PROJECT_VERSION})
|
set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION ${PROJECT_VERSION})
|
||||||
|
|
||||||
|
|
|
@ -11,4 +11,3 @@ target_sources(${PROJECT_NAME}
|
||||||
include(dmp/CMakeLists.txt)
|
include(dmp/CMakeLists.txt)
|
||||||
include(rlp/CMakeLists.txt)
|
include(rlp/CMakeLists.txt)
|
||||||
include(sdt/CMakeLists.txt)
|
include(sdt/CMakeLists.txt)
|
||||||
include(uuid/CMakeLists.txt)
|
|
||||||
|
|
|
@ -23,8 +23,7 @@
|
||||||
*/
|
*/
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "uuid/uuid.h"
|
#include "uuid.h"
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
*/
|
*/
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "uuid/uuid.h"
|
#include "uuid.h"
|
||||||
|
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
project(${PROJECT_NAME}_ietf VERSION 0.3.1 LANGUAGES CXX)
|
||||||
|
|
||||||
|
# RFC 4122 UUID
|
||||||
|
add_subdirectory(uuid)
|
|
@ -0,0 +1,16 @@
|
||||||
|
project(${PROJECT_NAME}_uuid VERSION 0.3.1 LANGUAGES CXX)
|
||||||
|
|
||||||
|
add_library(${PROJECT_NAME} SHARED)
|
||||||
|
|
||||||
|
target_sources(${PROJECT_NAME}
|
||||||
|
PUBLIC
|
||||||
|
uuid.h
|
||||||
|
PRIVATE
|
||||||
|
uuid.cpp
|
||||||
|
)
|
||||||
|
|
||||||
|
set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${PROJECT_VERSION})
|
||||||
|
set_target_properties(${PROJECT_NAME} PROPERTIES SOVERSION ${PROJECT_VERSION})
|
||||||
|
|
||||||
|
target_compile_definitions(${PROJECT_NAME} PUBLIC ${PROJECT_NAME}_LIBRARY)
|
||||||
|
target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
|
|
@ -1,6 +0,0 @@
|
||||||
target_sources(${PROJECT_NAME}
|
|
||||||
PUBLIC
|
|
||||||
uuid/uuid.h
|
|
||||||
PRIVATE
|
|
||||||
uuid/uuid.cpp
|
|
||||||
)
|
|
|
@ -14,6 +14,7 @@ if (GTest_FOUND)
|
||||||
PRIVATE
|
PRIVATE
|
||||||
GTest::gtest
|
GTest::gtest
|
||||||
LCP
|
LCP
|
||||||
|
LCP_ietf_uuid
|
||||||
)
|
)
|
||||||
target_include_directories(${PROJECT_NAME}
|
target_include_directories(${PROJECT_NAME}
|
||||||
PUBLIC
|
PUBLIC
|
||||||
|
|
|
@ -23,10 +23,8 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <gtest/gtest.h>
|
#include <gtest/gtest.h>
|
||||||
|
|
||||||
#include "uuid/uuid.h"
|
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include "uuid.h"
|
||||||
|
|
||||||
TEST(UUID, ver4fromString)
|
TEST(UUID, ver4fromString)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue