Skip to content

Commit

Permalink
Added vcpkg build
Browse files Browse the repository at this point in the history
  • Loading branch information
ihedvall committed Aug 14, 2023
1 parent 7854be3 commit 66b2c51
Show file tree
Hide file tree
Showing 11 changed files with 512 additions and 232 deletions.
1 change: 0 additions & 1 deletion .idea/.name

This file was deleted.

28 changes: 13 additions & 15 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,38 +1,37 @@
# Copyright 2023 Ingemar Hedvall
# SPDX-License-Identifier: MIT
cmake_minimum_required(VERSION 3.20)
project(dbcLib
project(dbclib
VERSION 1.0
DESCRIPTION "CAN DBC C++ library."
LANGUAGES CXX)

option(CMAKE_SHARED_LIBS "Static libraries are preferred" OFF)
option(BUILD_SHARED_LIBS "Static libraries are preferred" OFF)
option(DBC_DOC "If doxygen is installed, then build documentation in Release mode" OFF)
option(DBC_TOOLS "Building applications" ON)
option(DBC_TEST "Building unit test" ON)
option(DBC_YACC "Building Flex and Bison dependent files" OFF)

set(CMAKE_CXX_STANDARD 11)
set(CMAKE_DEBUG_POSTFIX d)

include(CMakePrintHelpers)

if (DBC_TOOLS)
include(script/wxwidgets.cmake)
include(script/wxwidgets.cmake)
endif()

if (DBC_TEST)
include(script/googletest.cmake)
include(script/googletest.cmake)
endif()

if (DBC_DOC)
include(script/doxygen.cmake)
include(script/doxygen.cmake)
endif()

include(script/flex.cmake)
include(script/bison.cmake)

if (DBC_YACC AND BISON_FOUND)
if (BISON_FOUND)
BISON_TARGET(DBC_PARSER src/dbcparser.y ${CMAKE_CURRENT_SOURCE_DIR}/src/dbcparser.cpp
COMPILE_FLAGS "")
cmake_print_variables(BISON_DBC_PARSER_DEFINED
Expand All @@ -44,16 +43,18 @@ if (DBC_YACC AND BISON_FOUND)
BISON_INCLUDE_DIRS)
endif ()

if (DBC_YACC AND FLEX_FOUND)
if (FLEX_FOUND)
FLEX_TARGET(DBC_SCANNER src/dbcflexer.l ${CMAKE_CURRENT_SOURCE_DIR}/src/dbcflexer.cpp)
cmake_print_variables(FLEX_DBC_SCANNER_DEFINED
FLEX_DBC_SCANNER_OUTPUTS
FLEX_DBC_SCANNER_INPUT
FLEX_DBC_SCANNER_OUTPUT_HEADER
FLEX_INCLUDE_DIRS)
# Copy FlexLexer.h. This is a dirty trick to avoid flex/bison installation in windows build
file(COPY_FILE ${FLEX_INCLUDE_DIRS}/FlexLexer.h ${CMAKE_CURRENT_SOURCE_DIR}/src/FlexLexer.h)
endif ()

if (DBC_YACC AND FLEX_FOUND AND BISON_FOUND)
if (FLEX_FOUND AND BISON_FOUND)
ADD_FLEX_BISON_DEPENDENCY(DBC_SCANNER DBC_PARSER)
endif()

Expand All @@ -71,9 +72,9 @@ set(DBCL_HEADERS
include/dbc/signalobserver.h
)

add_library(dbc STATIC
add_library(dbc
src/dbcparser.cpp src/dbcparser.hpp
src/dbcflexer.cpp
src/FlexLexer.h src/dbcflexer.cpp
${DBCL_HEADERS}
src/attribute.cpp
src/network.cpp
Expand All @@ -92,7 +93,7 @@ add_library(dbc STATIC
target_include_directories(dbc PUBLIC
$<INSTALL_INTERFACE:include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
${FLEX_INCLUDE_DIRS} )
)
target_include_directories(dbc PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src)

cmake_print_properties(TARGETS dbc PROPERTIES INCLUDE_DIRECTORIES)
Expand All @@ -101,9 +102,6 @@ if (MSVC)
target_compile_definitions(dbc PRIVATE _WIN32_WINNT=0x0A00)
endif ()

if (DBC_TOOLS)
# add_subdirectory(listend)
endif ()

if (wxWidgets_FOUND AND DBC_TOOLS)
add_subdirectory(dbcviewer)
Expand Down
5 changes: 4 additions & 1 deletion dbcviewer/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@ project(MdfViewer
LANGUAGES CXX)
set(CMAKE_CXX_STANDARD 20)
include("../script/boost.cmake")
include("../script/zlib.cmake")
include("../script/utillib.cmake")
include("../script/mdflib.cmake")

message(STATUS "ZLIB Libraries: " ${ZLIB_LIBRARIES})
add_executable(dbcview
src/dbcviewer.cpp src/dbcviewer.h
src/mainframe.cpp src/mainframe.h
Expand Down Expand Up @@ -41,13 +42,15 @@ endif()

target_link_libraries(dbcview PRIVATE dbc)
target_link_libraries(dbcview PRIVATE util)

if (MDFLIB_LOCAL_FETCH)
target_link_libraries(dbcview PRIVATE mdf)
else()
target_link_libraries(dbcview PRIVATE Upstream::mdf)
endif()
target_link_libraries(dbcview PRIVATE ${wxWidgets_LIBRARIES})
target_link_libraries(dbcview PRIVATE ${Boost_LIBRARIES})
target_link_libraries(dbcview PRIVATE ${ZLIB_LIBRARIES})

if (MINGW)
target_link_libraries(dbcview PRIVATE iconv)
Expand Down
20 changes: 20 additions & 0 deletions script/expat.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Copyright 2021 Ingemar Hedvall
# SPDX-License-Identifier: MIT

if (NOT EXPAT_FOUND)
find_package(EXPAT)
message(STATUS "EXPAT Found (Try 1): " ${EXPAT_FOUND})
if (NOT EXPAT_FOUND)
set(EXPAT_USE_STATIC_LIBS ON)
if (COMP_DIR)
set(EXPAT_ROOT ${COMP_DIR}/expat/master)
endif()

find_package(EXPAT REQUIRED)
message(STATUS "EXPAT Found (Try 2): " ${EXPAT_FOUND})
endif()
message(STATUS "EXPAT Include Dirs: " ${EXPAT_INCLUDE_DIRS})
message(STATUS "EXPAT Libraries: " ${EXPAT_LIBRARIES})
endif()


25 changes: 25 additions & 0 deletions script/zlib.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Copyright 2021 Ingemar Hedvall
# SPDX-License-Identifier: MIT

# Use the static ZLIB. Currently the line below doesn't work.
# The solution is to use the COMP_DIR if it is defined otherwise
# is the DLL version loaded.
set(ZLIB_USE_STATIC_LIBS ON)

if (NOT ZLIB_FOUND)
if (COMP_DIR)
set(ZLIB_ROOT ${COMP_DIR}/zlib/master)
endif()

find_package(ZLIB)
message(STATUS "ZLIB Found (Try 1): " ${ZLIB_FOUND})
if (NOT ZLIB_FOUND)
set(ZLIB_ROOT ${COMP_DIR}/zlib/master)
find_package(ZLIB REQUIRED)
message(STATUS "ZLIB Found (Try 2): " ${ZLIB_FOUND})
endif()
endif()

message(STATUS "ZLIB Version: " ${ZLIB_VERSION_STRING})
message(STATUS "ZLIB Include Dirs: " ${ZLIB_INCLUDE_DIRS})
message(STATUS "ZLIB Libraries: " ${ZLIB_LIBRARIES})
220 changes: 220 additions & 0 deletions src/FlexLexer.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,220 @@
// -*-C++-*-
// FlexLexer.h -- define interfaces for lexical analyzer classes generated
// by flex

// Copyright (c) 1993 The Regents of the University of California.
// All rights reserved.
//
// This code is derived from software contributed to Berkeley by
// Kent Williams and Tom Epperly.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions
// are met:

// 1. Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// 2. Redistributions in binary form must reproduce the above copyright
// notice, this list of conditions and the following disclaimer in the
// documentation and/or other materials provided with the distribution.

// Neither the name of the University nor the names of its contributors
// may be used to endorse or promote products derived from this software
// without specific prior written permission.

// THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
// IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
// PURPOSE.

// This file defines FlexLexer, an abstract class which specifies the
// external interface provided to flex C++ lexer objects, and yyFlexLexer,
// which defines a particular lexer class.
//
// If you want to create multiple lexer classes, you use the -P flag
// to rename each yyFlexLexer to some other xxFlexLexer. You then
// include <FlexLexer.h> in your other sources once per lexer class:
//
// #undef yyFlexLexer
// #define yyFlexLexer xxFlexLexer
// #include <FlexLexer.h>
//
// #undef yyFlexLexer
// #define yyFlexLexer zzFlexLexer
// #include <FlexLexer.h>
// ...

#ifndef __FLEX_LEXER_H
// Never included before - need to define base class.
#define __FLEX_LEXER_H

#include <iostream>

extern "C++" {

struct yy_buffer_state;
typedef int yy_state_type;

class FlexLexer
{
public:
virtual ~FlexLexer() { }

const char* YYText() const { return yytext; }
int YYLeng() const { return yyleng; }

virtual void
yy_switch_to_buffer( yy_buffer_state* new_buffer ) = 0;
virtual yy_buffer_state* yy_create_buffer( std::istream* s, int size ) = 0;
virtual yy_buffer_state* yy_create_buffer( std::istream& s, int size ) = 0;
virtual void yy_delete_buffer( yy_buffer_state* b ) = 0;
virtual void yyrestart( std::istream* s ) = 0;
virtual void yyrestart( std::istream& s ) = 0;

virtual int yylex() = 0;

// Call yylex with new input/output sources.
int yylex( std::istream& new_in, std::ostream& new_out )
{
switch_streams( new_in, new_out );
return yylex();
}

int yylex( std::istream* new_in, std::ostream* new_out = 0)
{
switch_streams( new_in, new_out );
return yylex();
}

// Switch to new input/output streams. A nil stream pointer
// indicates "keep the current one".
virtual void switch_streams( std::istream* new_in,
std::ostream* new_out ) = 0;
virtual void switch_streams( std::istream& new_in,
std::ostream& new_out ) = 0;

int lineno() const { return yylineno; }

int debug() const { return yy_flex_debug; }
void set_debug( int flag ) { yy_flex_debug = flag; }

protected:
char* yytext;
int yyleng;
int yylineno; // only maintained if you use %option yylineno
int yy_flex_debug; // only has effect with -d or "%option debug"
};

}
#endif // FLEXLEXER_H

#if defined(yyFlexLexer) || ! defined(yyFlexLexerOnce)
// Either this is the first time through (yyFlexLexerOnce not defined),
// or this is a repeated include to define a different flavor of
// yyFlexLexer, as discussed in the flex manual.
# define yyFlexLexerOnce

extern "C++" {

class yyFlexLexer : public FlexLexer {
public:
// arg_yyin and arg_yyout default to the cin and cout, but we
// only make that assignment when initializing in yylex().
yyFlexLexer( std::istream& arg_yyin, std::ostream& arg_yyout );
yyFlexLexer( std::istream* arg_yyin = 0, std::ostream* arg_yyout = 0 );
private:
void ctor_common();

public:

virtual ~yyFlexLexer();

void yy_switch_to_buffer( yy_buffer_state* new_buffer );
yy_buffer_state* yy_create_buffer( std::istream* s, int size );
yy_buffer_state* yy_create_buffer( std::istream& s, int size );
void yy_delete_buffer( yy_buffer_state* b );
void yyrestart( std::istream* s );
void yyrestart( std::istream& s );

void yypush_buffer_state( yy_buffer_state* new_buffer );
void yypop_buffer_state();

virtual int yylex();
virtual void switch_streams( std::istream& new_in, std::ostream& new_out );
virtual void switch_streams( std::istream* new_in = 0, std::ostream* new_out = 0 );
virtual int yywrap();

protected:
virtual int LexerInput( char* buf, int max_size );
virtual void LexerOutput( const char* buf, int size );
virtual void LexerError( const char* msg );

void yyunput( int c, char* buf_ptr );
int yyinput();

void yy_load_buffer_state();
void yy_init_buffer( yy_buffer_state* b, std::istream& s );
void yy_flush_buffer( yy_buffer_state* b );

int yy_start_stack_ptr;
int yy_start_stack_depth;
int* yy_start_stack;

void yy_push_state( int new_state );
void yy_pop_state();
int yy_top_state();

yy_state_type yy_get_previous_state();
yy_state_type yy_try_NUL_trans( yy_state_type current_state );
int yy_get_next_buffer();

std::istream yyin; // input source for default LexerInput
std::ostream yyout; // output sink for default LexerOutput

// yy_hold_char holds the character lost when yytext is formed.
char yy_hold_char;

// Number of characters read into yy_ch_buf.
int yy_n_chars;

// Points to current character in buffer.
char* yy_c_buf_p;

int yy_init; // whether we need to initialize
int yy_start; // start state number

// Flag which is used to allow yywrap()'s to do buffer switches
// instead of setting up a fresh yyin. A bit of a hack ...
int yy_did_buffer_switch_on_eof;


size_t yy_buffer_stack_top; /**< index of top of stack. */
size_t yy_buffer_stack_max; /**< capacity of stack. */
yy_buffer_state ** yy_buffer_stack; /**< Stack as an array. */
void yyensure_buffer_stack(void);

// The following are not always needed, but may be depending
// on use of certain flex features (like REJECT or yymore()).

yy_state_type yy_last_accepting_state;
char* yy_last_accepting_cpos;

yy_state_type* yy_state_buf;
yy_state_type* yy_state_ptr;

char* yy_full_match;
int* yy_full_state;
int yy_full_lp;

int yy_lp;
int yy_looking_for_trail_begin;

int yy_more_flag;
int yy_more_len;
int yy_more_offset;
int yy_prev_more_offset;
};

}

#endif // yyFlexLexer || ! yyFlexLexerOnce
Loading

0 comments on commit 66b2c51

Please sign in to comment.