make shared lib

CMakeLists.txt

@@ -5,6 +5,7 @@ project(${PROJECT_NAME})
 find_package(GTest)
 set(LIBS ${LIBS} nfc freefare)
 add_subdirectory(src)
+add_subdirectory(cli)
 if (GTEST_FOUND)
     enable_testing()
     add_subdirectory(tests)

cli/CMakeLists.txt

@@ -0,0 +1,16 @@
+include_directories(.)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+include_directories(. ../src)
+set(SOURCE_FILES
+        main.cpp
+        Interface/MainClass.cpp
+        Interface/MainClass.h
+        Interface/CommandLineParser.cpp
+        Interface/CommandLineParser.h
+        DBO/CommandLineOption.cpp
+        DBO/CommandLineOption.h
+        )
+
+set(LIBS ${LIBS} ${PROJECT_NAME})
+add_executable(${PROJECT_NAME}-cli ${SOURCE_FILES})
+target_link_libraries(${PROJECT_NAME}-cli ${LIBS})

src/Interface/CommandLineParser.h → cli/Interface/CommandLineParser.h

@@ -5,7 +5,7 @@
 #ifndef PDNS_SLAVE_COMMANDLINEPARSER_H
 #define PDNS_SLAVE_COMMANDLINEPARSER_H
 
-# include "DBO/CommandLineOption.h"
+# include "../DBO/CommandLineOption.h"
 
 class CommandLineParser
 {

src/Interface/MainClass.cpp → cli/Interface/MainClass.cpp

@@ -4,9 +4,9 @@
 
 #include <iostream>
 #include <sysexits.h>
-#include <DBO/Result.h>
-#include <DataAccess/LibNfc.h>
-#include <DataAccess/FreeFareDevice.h>
+#include "DBO/Result.h"
+#include "DataAccess/LibNfc.h"
+#include "DataAccess/FreeFareDevice.h"
 #include "CommandLineParser.h"
 #include "MainClass.h"
 

src/CMakeLists.txt

@@ -1,19 +1,17 @@
 include_directories(.)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 set(SOURCE_FILES
-  main.cpp
-  Interface/MainClass.cpp
-  Interface/MainClass.h
-  Interface/CommandLineParser.cpp
-  Interface/CommandLineParser.h
-  DBO/CommandLineOption.cpp
-  DBO/CommandLineOption.h
-  DBO/Result.hxx
-  DBO/Result.h
-  DataAccess/LibNfc.cpp
-  DataAccess/LibNfc.h
+        DBO/Result.hxx
+        DBO/Result.h
+        DataAccess/LibNfc.cpp
+        DataAccess/LibNfc.h
         DataAccess/NfcDevice.cpp
-        DataAccess/NfcDevice.h DataAccess/FreeFareDevice.cpp DataAccess/FreeFareDevice.h DataAccess/FreeFareTag.cpp DataAccess/FreeFareTag.h)
+        DataAccess/NfcDevice.h
+        DataAccess/FreeFareDevice.cpp
+        DataAccess/FreeFareDevice.h
+        DataAccess/FreeFareTag.cpp
+        DataAccess/FreeFareTag.h
+        )
 
-add_executable(${PROJECT_NAME} ${SOURCE_FILES})
+add_library(${PROJECT_NAME} SHARED ${SOURCE_FILES})
 target_link_libraries(${PROJECT_NAME} ${LIBS})

tests/CMakeLists.txt

@@ -6,6 +6,8 @@ set(LIBS ${LIBS} gtest pthread)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 add_executable(test-${PROJECT_NAME}
         test-main.cpp
-  )
+        )
+
+set(LIBS ${LIBS} ${PROJECT_NAME})
 target_link_libraries(test-${PROJECT_NAME} ${LIBS})
 add_test(test-${PROJECT_NAME} ${CMAKE_CURRENT_BINARY_DIR}/test-${PROJECT_NAME})

tests/test-main.cpp

@@ -1,6 +1,7 @@
 #include <iostream>
 #include <string.h>
 #include <gtest/gtest.h>
+#include <DataAccess/LibNfc.h>
 
 TEST(None, None)
 {
@@ -9,6 +10,7 @@ TEST(None, None)
 
 int main(int argc, char* argv[])
 {
+  std::cout << "LibNfc version: " << LibNfc::getVersion() << std::endl;
   ::testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();
 }