Browse Source

make shared lib

develop
Robin Thoni 8 years ago
parent
commit
7e6f98a65a

+ 1
- 0
CMakeLists.txt View File

5
 find_package(GTest)
5
 find_package(GTest)
6
 set(LIBS ${LIBS} nfc freefare)
6
 set(LIBS ${LIBS} nfc freefare)
7
 add_subdirectory(src)
7
 add_subdirectory(src)
8
+add_subdirectory(cli)
8
 if (GTEST_FOUND)
9
 if (GTEST_FOUND)
9
     enable_testing()
10
     enable_testing()
10
     add_subdirectory(tests)
11
     add_subdirectory(tests)

+ 16
- 0
cli/CMakeLists.txt View File

1
+include_directories(.)
2
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
3
+include_directories(. ../src)
4
+set(SOURCE_FILES
5
+        main.cpp
6
+        Interface/MainClass.cpp
7
+        Interface/MainClass.h
8
+        Interface/CommandLineParser.cpp
9
+        Interface/CommandLineParser.h
10
+        DBO/CommandLineOption.cpp
11
+        DBO/CommandLineOption.h
12
+        )
13
+
14
+set(LIBS ${LIBS} ${PROJECT_NAME})
15
+add_executable(${PROJECT_NAME}-cli ${SOURCE_FILES})
16
+target_link_libraries(${PROJECT_NAME}-cli ${LIBS})

src/DBO/CommandLineOption.cpp → cli/DBO/CommandLineOption.cpp View File


src/DBO/CommandLineOption.h → cli/DBO/CommandLineOption.h View File


src/Interface/CommandLineParser.cpp → cli/Interface/CommandLineParser.cpp View File


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

5
 #ifndef PDNS_SLAVE_COMMANDLINEPARSER_H
5
 #ifndef PDNS_SLAVE_COMMANDLINEPARSER_H
6
 #define PDNS_SLAVE_COMMANDLINEPARSER_H
6
 #define PDNS_SLAVE_COMMANDLINEPARSER_H
7
 
7
 
8
-# include "DBO/CommandLineOption.h"
8
+# include "../DBO/CommandLineOption.h"
9
 
9
 
10
 class CommandLineParser
10
 class CommandLineParser
11
 {
11
 {

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

4
 
4
 
5
 #include <iostream>
5
 #include <iostream>
6
 #include <sysexits.h>
6
 #include <sysexits.h>
7
-#include <DBO/Result.h>
8
-#include <DataAccess/LibNfc.h>
9
-#include <DataAccess/FreeFareDevice.h>
7
+#include "DBO/Result.h"
8
+#include "DataAccess/LibNfc.h"
9
+#include "DataAccess/FreeFareDevice.h"
10
 #include "CommandLineParser.h"
10
 #include "CommandLineParser.h"
11
 #include "MainClass.h"
11
 #include "MainClass.h"
12
 
12
 

src/Interface/MainClass.h → cli/Interface/MainClass.h View File


src/main.cpp → cli/main.cpp View File


+ 11
- 13
src/CMakeLists.txt View File

1
 include_directories(.)
1
 include_directories(.)
2
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
2
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
3
 set(SOURCE_FILES
3
 set(SOURCE_FILES
4
-  main.cpp
5
-  Interface/MainClass.cpp
6
-  Interface/MainClass.h
7
-  Interface/CommandLineParser.cpp
8
-  Interface/CommandLineParser.h
9
-  DBO/CommandLineOption.cpp
10
-  DBO/CommandLineOption.h
11
-  DBO/Result.hxx
12
-  DBO/Result.h
13
-  DataAccess/LibNfc.cpp
14
-  DataAccess/LibNfc.h
4
+        DBO/Result.hxx
5
+        DBO/Result.h
6
+        DataAccess/LibNfc.cpp
7
+        DataAccess/LibNfc.h
15
         DataAccess/NfcDevice.cpp
8
         DataAccess/NfcDevice.cpp
16
-        DataAccess/NfcDevice.h DataAccess/FreeFareDevice.cpp DataAccess/FreeFareDevice.h DataAccess/FreeFareTag.cpp DataAccess/FreeFareTag.h)
9
+        DataAccess/NfcDevice.h
10
+        DataAccess/FreeFareDevice.cpp
11
+        DataAccess/FreeFareDevice.h
12
+        DataAccess/FreeFareTag.cpp
13
+        DataAccess/FreeFareTag.h
14
+        )
17
 
15
 
18
-add_executable(${PROJECT_NAME} ${SOURCE_FILES})
16
+add_library(${PROJECT_NAME} SHARED ${SOURCE_FILES})
19
 target_link_libraries(${PROJECT_NAME} ${LIBS})
17
 target_link_libraries(${PROJECT_NAME} ${LIBS})

+ 3
- 1
tests/CMakeLists.txt View File

6
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
6
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
7
 add_executable(test-${PROJECT_NAME}
7
 add_executable(test-${PROJECT_NAME}
8
         test-main.cpp
8
         test-main.cpp
9
-  )
9
+        )
10
+
11
+set(LIBS ${LIBS} ${PROJECT_NAME})
10
 target_link_libraries(test-${PROJECT_NAME} ${LIBS})
12
 target_link_libraries(test-${PROJECT_NAME} ${LIBS})
11
 add_test(test-${PROJECT_NAME} ${CMAKE_CURRENT_BINARY_DIR}/test-${PROJECT_NAME})
13
 add_test(test-${PROJECT_NAME} ${CMAKE_CURRENT_BINARY_DIR}/test-${PROJECT_NAME})

+ 2
- 0
tests/test-main.cpp View File

1
 #include <iostream>
1
 #include <iostream>
2
 #include <string.h>
2
 #include <string.h>
3
 #include <gtest/gtest.h>
3
 #include <gtest/gtest.h>
4
+#include <DataAccess/LibNfc.h>
4
 
5
 
5
 TEST(None, None)
6
 TEST(None, None)
6
 {
7
 {
9
 
10
 
10
 int main(int argc, char* argv[])
11
 int main(int argc, char* argv[])
11
 {
12
 {
13
+  std::cout << "LibNfc version: " << LibNfc::getVersion() << std::endl;
12
   ::testing::InitGoogleTest(&argc, argv);
14
   ::testing::InitGoogleTest(&argc, argv);
13
   return RUN_ALL_TESTS();
15
   return RUN_ALL_TESTS();
14
 }
16
 }

Loading…
Cancel
Save