fixed includes for instalation; switched to c++11

src/CMakeLists.txt

@@ -1,17 +1,21 @@
 include_directories(.)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -pthread -I${PCSCLITE_INCLUDE_DIR} -I${CMAKE_SOURCE_DIR}/src/include")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -pthread -I${PCSCLITE_INCLUDE_DIR}")
 set(SOURCE_FILES
   DBO/ScCommand.cpp
-  include/ScCommand.h
-  include/ScCommand.hxx
+  libpcsc_cpptools/ScCommand.h
+  libpcsc_cpptools/ScCommand.hxx
   DBO/ScBasicCommand.cpp
-  include/ScBasicCommand.h
-  include/ScBasicCommand.hxx
+  libpcsc_cpptools/ScBasicCommand.h
+  libpcsc_cpptools/ScBasicCommand.hxx
   DBO/ScResult.cpp
-  include/ScResult.h
-  include/ScResult.hxx
+  libpcsc_cpptools/ScResult.h
+  libpcsc_cpptools/ScResult.hxx
   DataAccess/ScReader.cpp
-  include/ScReader.h
-  include/ScReader.hxx)
-add_library(pcsc_cpptools SHARED ${SOURCE_FILES} include/ScHex.h DBO/ScHex.cpp include/ScApduCommand.h DBO/ScApduCommand.cpp)
+  libpcsc_cpptools/ScReader.h
+  libpcsc_cpptools/ScReader.hxx
+  DBO/ScHex.cpp
+  libpcsc_cpptools/ScHex.h
+  DBO/ScApduCommand.cpp
+  libpcsc_cpptools/ScApduCommand.h)
+add_library(pcsc_cpptools SHARED ${SOURCE_FILES})
 target_link_libraries(pcsc_cpptools pcsclite)

src/DBO/ScApduCommand.cpp

@@ -2,4 +2,4 @@
 // Created by robin on 6/30/15.
 //
 
-#include "ScApduCommand.h"
+#include "libpcsc_cpptools/ScApduCommand.h"

src/DBO/ScBasicCommand.cpp

@@ -3,8 +3,8 @@
 //
 
 #include <string>
-#include <ScHex.h>
-#include "ScBasicCommand.h"
+#include "libpcsc_cpptools/ScHex.h"
+#include "libpcsc_cpptools/ScBasicCommand.h"
 
 ScBasicCommand::ScBasicCommand(const std::string &data)
 {

src/DBO/ScCommand.cpp

@@ -2,7 +2,7 @@
 // Created by robin on 6/27/15.
 //
 
-#include "ScCommand.h"
+#include "libpcsc_cpptools/ScCommand.h"
 
 ScCommand::~ScCommand()
 {

src/DBO/ScHex.cpp

@@ -4,7 +4,7 @@
 
 #include <string>
 #include <wintypes.h>
-#include "ScHex.h"
+#include "libpcsc_cpptools/ScHex.h"
 
 
 const char ScHex::hexCharToInt(const char& c)

src/DBO/ScResult.cpp

@@ -2,7 +2,7 @@
 // Created by robin on 6/27/15.
 //
 
-#include "ScResult.h"
+#include "libpcsc_cpptools/ScResult.h"
 
 ScResult::ScResult(const std::string &data)
     : _data(data)

src/DataAccess/ScReader.cpp

@@ -5,10 +5,10 @@
 #include <winscard.h>
 #include <vector>
 #include <string.h>
-#include "ScReader.h"
+#include "libpcsc_cpptools/ScReader.h"
 
-thread_local LPSCARDCONTEXT ScReader::_context = nullptr;
-thread_local LONG ScReader::_lastStaticResult = SCARD_S_SUCCESS;
+/*thread_local*/ LPSCARDCONTEXT ScReader::_context = nullptr;
+/*thread_local*/ LONG ScReader::_lastStaticResult = SCARD_S_SUCCESS;
 
 ScReader::~ScReader()
 {

src/include/ScReader.h → src/libpcsc_cpptools/ScReader.h

@@ -50,9 +50,9 @@ public:
 private:
     std::string _name;
 
-    static thread_local LPSCARDCONTEXT _context;
+    static /*thread_local*/ LPSCARDCONTEXT _context;
 
-    static thread_local LONG _lastStaticResult;
+    static /*thread_local*/ LONG _lastStaticResult;
 
     LPSCARDHANDLE _card;
 

tests/CMakeLists.txt

@@ -2,7 +2,7 @@ enable_testing()
 include_directories(${CHECK_INCLUDE_DIRS})
 set(LIBS ${LIBS} pcsc_cpptools gtest)
 include_directories(. ../src)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -pthread -I/usr/include/PCSC -I${CMAKE_SOURCE_DIR}/src/include")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -pthread -I/usr/include/PCSC -I${CMAKE_SOURCE_DIR}/src/include")
 add_executable(test_pcsc_cpp_tools test_pcsc_cpp_tools.cpp)
 target_link_libraries(test_pcsc_cpp_tools ${LIBS})
 add_test(test_pcsc_cpp_tools ${CMAKE_CURRENT_BINARY_DIR}/test_pcsc_cpp_tools)

tests/test_pcsc_cpp_tools.cpp

@@ -1,9 +1,9 @@
 #include <iostream>
 #include <string.h>
 #include <gtest/gtest.h>
-#include <ScHex.h>
-#include <ScReader.h>
-#include <ScBasicCommand.h>
+#include <libpcsc_cpptools/ScHex.h>
+#include <libpcsc_cpptools/ScReader.h>
+#include <libpcsc_cpptools/ScBasicCommand.h>
 
 #define TEST_Hex(FUNCTION) do {                                                   \
     FUNCTION("", "", 0);                                                          \