RantyDave · thewtex · Feb 13, 2022
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,17 +1,14 @@
-cmake_minimum_required (VERSION 3.11)
+cmake_minimum_required (VERSION 3.16)
 project (cppbor)
 
-set(CMAKE_CXX_COMPILER /Library/Developer/CommandLineTools/usr/bin/clang++)
-set(CMAKE_CXX_STANDARD 17)
-include_directories(SYSTEM /Library/Developer/CommandLineTools/usr/include/c++/v1)
-include_directories(/usr/local/include)
-link_directories(/usr/local/lib)
-link_directories(/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib)
+if(NOT DEFINED CMAKE_CXX_STANDARD)
+  set(CMAKE_CXX_STANDARD 17)
+endif()
 
-file(GLOB test_sources cppbor/test_sources/*)
-file(COPY ${test_sources} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-add_executable(cppbor cppbor/main cppbor/cppbor)
-target_link_libraries(cppbor c++ cppunit)
-add_executable(bench bench.cpp cppbor/cppbor)
-target_link_libraries(bench c++)
-set(CMAKE_BUILD_TYPE Release)
+add_library(cppbor src/cppbor.cpp)
+target_include_directories(cppbor PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include/)
+
+include(CTest)
+if(BUILD_TESTING)
+  add_subdirectory(test)
+endif()
diff --git a/cppbor.config b/cppbor.config
diff --git a/cppbor.creator b/cppbor.creator
diff --git a/cppbor.files b/cppbor.files
diff --git a/cppbor.includes b/cppbor.includes
diff --git a/cppbor/cppbor.hpp → include/cppbor.hpp b/cppbor/cppbor.hpp → include/cppbor.hpp
diff --git a/cppbor/cppbor.cpp → src/cppbor.cpp b/cppbor/cppbor.cpp → src/cppbor.cpp
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -0,0 +1,12 @@
+find_library(CPPUNIT_LIBRARY cppunit)
+find_path(CPPUNIT_INCLUDE_DIR cppunit/extensions/HelperMacros.h)
+if(NOT CPPUNIT_LIBRARY OR NOT CPPUNIT_INCLUDE_DIR)
+  message(SEND_ERROR "Could not find cppunit for tests")
+endif()
+
+add_executable(test_main main.cpp)
+target_include_directories(test_main PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+target_link_libraries(test_main ${CPPUNIT_LIBRARY} cppbor)
+add_test(NAME main_test COMMAND test_main
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test_sources
+  )
diff --git a/cppbor/main.cpp → test/main.cpp b/cppbor/main.cpp → test/main.cpp
diff --git a/cppbor/main.h → test/main.h b/cppbor/main.h → test/main.h
diff --git a/cppbor/sources.py → test/sources.py b/cppbor/sources.py → test/sources.py
diff --git a/cppbor/test_sources/array → test/test_sources/array b/cppbor/test_sources/array → test/test_sources/array
diff --git a/cppbor/test_sources/array-map → test/test_sources/array-map b/cppbor/test_sources/array-map → test/test_sources/array-map
diff --git a/cppbor/test_sources/bytes → test/test_sources/bytes b/cppbor/test_sources/bytes → test/test_sources/bytes
diff --git a/cppbor/test_sources/float → test/test_sources/float b/cppbor/test_sources/float → test/test_sources/float
diff --git a/cppbor/test_sources/int → test/test_sources/int b/cppbor/test_sources/int → test/test_sources/int
diff --git a/cppbor/test_sources/map → test/test_sources/map b/cppbor/test_sources/map → test/test_sources/map
diff --git a/cppbor/test_sources/none → test/test_sources/none b/cppbor/test_sources/none → test/test_sources/none
diff --git a/cppbor/test_sources/string → test/test_sources/string b/cppbor/test_sources/string → test/test_sources/string