From 04920c0e9a51ed0a5d194410917dca95ffb06c55 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Tue, 23 Jul 2024 12:05:39 +1000 Subject: [PATCH] xo-tokenizer: build: canonical lib/proj names, + xo_ prefix --- CMakeLists.txt | 2 +- cmake/{tokenizerConfig.cmake.in => xo_tokenizerConfig.cmake.in} | 0 src/tokenizer/CMakeLists.txt | 2 +- utest/CMakeLists.txt | 2 +- utest/tokenizer.test.cpp | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename cmake/{tokenizerConfig.cmake.in => xo_tokenizerConfig.cmake.in} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index d6500a69..147e16c7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10) -project(tokenizer VERSION 0.1) +project(xo_tokenizer VERSION 0.1) include(GNUInstallDirs) include(cmake/xo-bootstrap-macros.cmake) diff --git a/cmake/tokenizerConfig.cmake.in b/cmake/xo_tokenizerConfig.cmake.in similarity index 100% rename from cmake/tokenizerConfig.cmake.in rename to cmake/xo_tokenizerConfig.cmake.in diff --git a/src/tokenizer/CMakeLists.txt b/src/tokenizer/CMakeLists.txt index 6408d151..cad846f4 100644 --- a/src/tokenizer/CMakeLists.txt +++ b/src/tokenizer/CMakeLists.txt @@ -1,6 +1,6 @@ # tokenizer/CMakeLists.txt -set(SELF_LIB tokenizer) +set(SELF_LIB xo_tokenizer) set(SELF_SRCS tokentype.cpp token.cpp) diff --git a/utest/CMakeLists.txt b/utest/CMakeLists.txt index 8dbd2ad2..cc080294 100644 --- a/utest/CMakeLists.txt +++ b/utest/CMakeLists.txt @@ -7,7 +7,7 @@ set(SELF_SOURCE_FILES token.test.cpp) xo_add_utest_executable(${SELF_EXECUTABLE_NAME} ${SELF_SOURCE_FILES}) -xo_self_dependency(${SELF_EXECUTABLE_NAME} tokenizer) +xo_self_dependency(${SELF_EXECUTABLE_NAME} xo_tokenizer) xo_external_target_dependency(${SELF_EXECUTABLE_NAME} Catch2 Catch2::Catch2) # end CMakeLists.txt diff --git a/utest/tokenizer.test.cpp b/utest/tokenizer.test.cpp index dff86541..cb796f47 100644 --- a/utest/tokenizer.test.cpp +++ b/utest/tokenizer.test.cpp @@ -3,7 +3,7 @@ * author: Roland Conybeare */ -#include "tokenizer.hpp" +#include "xo/tokenizer/tokenizer.hpp" #include namespace xo {