Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-02 02:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reverting back to static .a files for C++ and fixing lots of other assorted items

Browse Source
This commit is contained in:
Patrick Plenefisch
2014-05-02 17:54:01 -04:00
parent c1482cb267
commit 9b831ed34c
178 changed files with 1901 additions and 1846 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
networktables/cpp/CMakeLists.txt
View File

@@ -4,9 +4,9 @@ project(NetworkTables)
file(GLOB_RECURSE SRC_TARGET_FILES lib/Athena/*.cpp)
file(GLOB_RECURSE SRC_SHARE_FILES lib/share/*.cpp)
include_directories(include)
add_library(NetworkTables SHARED ${SRC_SHARE_FILES} ${SRC_TARGET_FILES})
add_library(NetworkTables STATIC ${SRC_SHARE_FILES} ${SRC_TARGET_FILES})
target_link_libraries(NetworkTables ${NI_LIBS})
INSTALL(TARGETS NetworkTables LIBRARY DESTINATION lib COMPONENT lib)
INSTALL(TARGETS NetworkTables ARCHIVE DESTINATION lib COMPONENT lib)
INSTALL(DIRECTORY include DESTINATION ${CMAKE_INSTALL_PREFIX} COMPONENT headers)
# lib/ c gcc_s ld-linux
# usr/lib stdc++

1
networktables/cpp/include/networktables2/client/ClientConnectionState.h
View File

@@ -83,6 +83,7 @@ private:
std::exception& e;
char msg[100];
public:
virtual ~ClientConnectionState_Error(){}
/**
* Create a new error state
* @param e