Kaynağa Gözat

cmake install rules; fixed cli tags and devices actions

develop
Robin Thoni 7 yıl önce
ebeveyn
işleme
47e931adc2

+ 1
- 1
CMakeLists.txt Dosyayı Görüntüle

26
 if (GTEST_FOUND)
26
 if (GTEST_FOUND)
27
     enable_testing()
27
     enable_testing()
28
     add_subdirectory(tests)
28
     add_subdirectory(tests)
29
-endif (GTEST_FOUND)
29
+endif (GTEST_FOUND)

+ 3
- 0
cli/CMakeLists.txt Dosyayı Görüntüle

14
 set(LIBS ${LIBS} ${PROJECT_NAME})
14
 set(LIBS ${LIBS} ${PROJECT_NAME})
15
 add_executable(${PROJECT_NAME}-cli ${SOURCE_FILES})
15
 add_executable(${PROJECT_NAME}-cli ${SOURCE_FILES})
16
 target_link_libraries(${PROJECT_NAME}-cli ${LIBS})
16
 target_link_libraries(${PROJECT_NAME}-cli ${LIBS})
17
+
18
+install(TARGETS ${PROJECT_NAME}-cli
19
+        RUNTIME DESTINATION bin)

+ 10
- 6
cli/Interface/MainClass.cpp Dosyayı Görüntüle

145
         }
145
         }
146
         action = Write;
146
         action = Write;
147
     }
147
     }
148
+    else if (optionDevices.isSet()) {
149
+        action = Devices;
150
+    }
151
+    else if (optionTags.isSet()) {
152
+        action = Tags;
153
+    }
148
     else {
154
     else {
149
         std::cerr << "Must select an action (map|read|write|devices|tags)" << std::endl;
155
         std::cerr << "Must select an action (map|read|write|devices|tags)" << std::endl;
150
         return EX_USAGE;
156
         return EX_USAGE;
168
         {
174
         {
169
             auto devices = devicesResult.getData();
175
             auto devices = devicesResult.getData();
170
 
176
 
171
-            if (optionDevices.isSet())
177
+            if (action == Devices)
172
             {
178
             {
173
                 for (auto device : devices) {
179
                 for (auto device : devices) {
174
                     cout() << device->getConnStr() << std::endl;
180
                     cout() << device->getConnStr() << std::endl;
192
 
198
 
193
                         FreeFareDeviceBusiness freeFareDevice(device);
199
                         FreeFareDeviceBusiness freeFareDevice(device);
194
                         auto tagsResult = freeFareDevice.getTags();
200
                         auto tagsResult = freeFareDevice.getTags();
195
-                        if (!tagsResult)
196
-                        {
201
+                        if (!tagsResult) {
197
                             tagsResult.print();
202
                             tagsResult.print();
198
                             res = EX_LIB_NFC_ERROR;
203
                             res = EX_LIB_NFC_ERROR;
199
                         }
204
                         }
200
 
205
 
201
                         auto tags = tagsResult.getData();
206
                         auto tags = tagsResult.getData();
202
 
207
 
203
-                        if (optionTags.isSet()) {
204
-                            for (auto tag : tags)
205
-                            {
208
+                        if (action == Tags) {
209
+                            for (auto tag : tags) {
206
                                 cout() << "UID=" << tag->getUid() << " \tType=" << tag->getType() << std::endl;
210
                                 cout() << "UID=" << tag->getUid() << " \tType=" << tag->getType() << std::endl;
207
                             }
211
                             }
208
                         }
212
                         }

+ 3
- 1
cli/Interface/MainClass.h Dosyayı Görüntüle

14
     enum Actions {
14
     enum Actions {
15
         Read,
15
         Read,
16
         Write,
16
         Write,
17
-        Map
17
+        Map,
18
+        Devices,
19
+        Tags
18
     };
20
     };
19
 
21
 
20
     MainClass(int argc, char* argv[]);
22
     MainClass(int argc, char* argv[]);

+ 3
- 0
src/CMakeLists.txt Dosyayı Görüntüle

15
 
15
 
16
 add_library(${PROJECT_NAME} SHARED ${SOURCE_FILES})
16
 add_library(${PROJECT_NAME} SHARED ${SOURCE_FILES})
17
 target_link_libraries(${PROJECT_NAME} ${LIBS})
17
 target_link_libraries(${PROJECT_NAME} ${LIBS})
18
+
19
+install(TARGETS ${PROJECT_NAME}
20
+        LIBRARY DESTINATION lib)

Loading…
İptal
Kaydet