Skip to content
Snippets Groups Projects
Commit 3b63bfa2 authored by Valerio Pastore's avatar Valerio Pastore
Browse files

build static

parent 8345cdee
No related branches found
No related tags found
No related merge requests found
...@@ -3,6 +3,7 @@ project(Astri_Packet) ...@@ -3,6 +3,7 @@ project(Astri_Packet)
set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++1y") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++1y")
option(ASTRIPACKET_BUILD_SHARED "Build astripacket as a shared library." OFF)
set(SOURCES set(SOURCES
src/PacketStructureTxt.cpp src/PacketStructureTxt.cpp
...@@ -14,8 +15,15 @@ set(SOURCES ...@@ -14,8 +15,15 @@ set(SOURCES
add_subdirectory(deps/Base-DAQ EXCLUDE_FROM_ALL) add_subdirectory(deps/Base-DAQ EXCLUDE_FROM_ALL)
# Target # Target
add_library(AstriPacket ${SOURCES}) if(ASTRIPACKET_BUILD_SHARED)
message(STATUS "Build will generate a shared library. "
"Use ASTRIPACKET_BUILD_SHARED=0 to perform a static build")
set(ASTRIPACKET_LIBRARY_TYPE SHARED)
else()
message(STATUS "Build will generate a static library.")
set(ASTRIPACKET_LIBRARY_TYPE STATIC)
endif()
add_library(AstriPacket ${ASTRIPACKET_LIBRARY_TYPE} ${SOURCES})
# include files # include files
set(INC_DIR set(INC_DIR
"${PROJECT_SOURCE_DIR}/include" "${PROJECT_SOURCE_DIR}/include"
...@@ -26,3 +34,9 @@ target_include_directories (AstriPacket PUBLIC ${INC_DIR}) ...@@ -26,3 +34,9 @@ target_include_directories (AstriPacket PUBLIC ${INC_DIR})
# make install # make install
install(TARGETS AstriPacket DESTINATION "${CMAKE_INSTALL_PREFIX}/lib") install(TARGETS AstriPacket DESTINATION "${CMAKE_INSTALL_PREFIX}/lib")
file(GLOB CONFIG "config")
install(
DIRECTORY ${CONFIG}
DESTINATION "${CMAKE_INSTALL_PREFIX}/config"
)
\ No newline at end of file
crc_flag 1 crc_flag 1
TelescopeID 7 TelescopeID 7
Type 4 Type 4
SubType 4 Subtype 4
SSC 16 SSC 16
length 16 length 16
array : 8192 { array : 8192 {
binary 64 binary 64
} }
\ No newline at end of file
...@@ -4,6 +4,9 @@ ...@@ -4,6 +4,9 @@
#include <Base_Packet.h> #include <Base_Packet.h>
#include <fstream> #include <fstream>
#include <algorithm>
namespace inaf::oasbo::Packets { namespace inaf::oasbo::Packets {
class AstriPacketGeneric : public inaf::oasbo::PacketLib::BasePacket { class AstriPacketGeneric : public inaf::oasbo::PacketLib::BasePacket {
......
...@@ -14,7 +14,7 @@ size_t AstriPacketGeneric::getHeaderSize(){ ...@@ -14,7 +14,7 @@ size_t AstriPacketGeneric::getHeaderSize(){
} }
size_t AstriPacketGeneric::getPayloadSize(){ size_t AstriPacketGeneric::getPayloadSize(){
return this->operator []("length")+1; return this->operator []("length")-1;
} }
size_t AstriPacketGeneric::getTailSize(){ size_t AstriPacketGeneric::getTailSize(){
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment