1
0
forked from Alepha/Alepha

Merge branch 'master' of github.com:adamlsd/Alepha

Conflicts:
	cmake/rules.cmake
This commit is contained in:
2023-10-20 04:50:11 -04:00
4 changed files with 11 additions and 1 deletions

View File

@ -24,6 +24,7 @@ namespace
{ {
namespace util= Alepha::Utility; namespace util= Alepha::Utility;
using namespace Alepha::Testing::exports; using namespace Alepha::Testing::exports;
namespace boost= Alepha::boost;
struct tag; struct tag;

View File

@ -78,6 +78,7 @@ static_assert( __cplusplus > 2020'00 );
* an informative message about the parsing error encountered. * an informative message about the parsing error encountered.
*/ */
#include <Alepha/Alepha.h>
#include <string> #include <string>
#include <typeindex> #include <typeindex>

View File

@ -1,7 +1,8 @@
#cmake_policy( SET CMP0002 OLD ) #cmake_policy( SET CMP0002 OLD )
add_compile_options( -I ${CMAKE_BINARY_DIR} ; -std=c++20 ; -I . ) add_compile_options( -std=c++20 )
add_compile_options( -fdiagnostics-column-unit=byte ) add_compile_options( -fdiagnostics-column-unit=byte )
include_directories( ${CMAKE_BINARY_DIR} . )
list( APPEND CMAKE_CTEST_ARGUMENTS "-VV" ) list( APPEND CMAKE_CTEST_ARGUMENTS "-VV" )
@ -12,6 +13,11 @@ set( CMAKE_VERBOSE_MAKEFILE true )
file( CREATE_LINK ${CMAKE_SOURCE_DIR} Alepha SYMBOLIC ) file( CREATE_LINK ${CMAKE_SOURCE_DIR} Alepha SYMBOLIC )
if( DEFINED ALEPHA_BOOST_PATH )
file( CREATE_LINK ${CMAKE_BINARY_DIR}/${ALEPHA_BOOST_PATH} boost SYMBOLIC )
include_directories( ${CMAKE_BINARY_DIR}/${ALEPHA_BOOST_PATH}/.. )
endif()
include(CTest) include(CTest)

View File

@ -2,6 +2,8 @@ static_assert( __cplusplus > 2020'00 );
#pragma once #pragma once
#include <Alepha/Alepha.h>
#include <cassert> #include <cassert>
#include <iostream> #include <iostream>