cmake install rules; fixed cli tags and devices actions

CMakeLists.txt

@@ -26,4 +26,4 @@ add_subdirectory(cli)
 if (GTEST_FOUND)
     enable_testing()
     add_subdirectory(tests)
-endif (GTEST_FOUND)
+endif (GTEST_FOUND)

cli/CMakeLists.txt

@@ -14,3 +14,6 @@ set(SOURCE_FILES
 set(LIBS ${LIBS} ${PROJECT_NAME})
 add_executable(${PROJECT_NAME}-cli ${SOURCE_FILES})
 target_link_libraries(${PROJECT_NAME}-cli ${LIBS})
+
+install(TARGETS ${PROJECT_NAME}-cli
+        RUNTIME DESTINATION bin)

cli/Interface/MainClass.cpp

@@ -145,6 +145,12 @@ int MainClass::main()
         }
         action = Write;
     }
+    else if (optionDevices.isSet()) {
+        action = Devices;
+    }
+    else if (optionTags.isSet()) {
+        action = Tags;
+    }
     else {
         std::cerr << "Must select an action (map|read|write|devices|tags)" << std::endl;
         return EX_USAGE;
@@ -168,7 +174,7 @@ int MainClass::main()
         {
             auto devices = devicesResult.getData();
 
-            if (optionDevices.isSet())
+            if (action == Devices)
             {
                 for (auto device : devices) {
                     cout() << device->getConnStr() << std::endl;
@@ -192,17 +198,15 @@ int MainClass::main()
 
                         FreeFareDeviceBusiness freeFareDevice(device);
                         auto tagsResult = freeFareDevice.getTags();
-                        if (!tagsResult)
-                        {
+                        if (!tagsResult) {
                             tagsResult.print();
                             res = EX_LIB_NFC_ERROR;
                         }
 
                         auto tags = tagsResult.getData();
 
-                        if (optionTags.isSet()) {
-                            for (auto tag : tags)
-                            {
+                        if (action == Tags) {
+                            for (auto tag : tags) {
                                 cout() << "UID=" << tag->getUid() << " \tType=" << tag->getType() << std::endl;
                             }
                         }

cli/Interface/MainClass.h

@@ -14,7 +14,9 @@ public:
     enum Actions {
         Read,
         Write,
-        Map
+        Map,
+        Devices,
+        Tags
     };
 
     MainClass(int argc, char* argv[]);

src/CMakeLists.txt

@@ -15,3 +15,6 @@ set(SOURCE_FILES
 
 add_library(${PROJECT_NAME} SHARED ${SOURCE_FILES})
 target_link_libraries(${PROJECT_NAME} ${LIBS})
+
+install(TARGETS ${PROJECT_NAME}
+        LIBRARY DESTINATION lib)