unify underscore hyphen conflicts

will-rowe · Aug 10, 2020 · af70a18 · af70a18
1 parent cb1bc65
commit af70a18
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -52,5 +52,5 @@ script:
   - cd build
   - cmake -DCMAKE_BUILD_TYPE=Debug ..
   - make -j2
-  - ../bin/artic_tests
+  - ../bin/artic-tools_tests
   - ../bin/artic-tools -v
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -97,9 +97,6 @@ add_subdirectory(extlib/spdlog)
 # rapidcsv
 include_directories(${PROJECT_SOURCE_DIR}/extlib/rapidcsv/src)
 
-# ntHash
-#include_directories(${PROJECT_SOURCE_DIR}/extlib/ntHash)
-
 # google test
 if(BUILD_TESTING)
     add_subdirectory(extlib/googletest)

diff --git a/app/artic_tools.cpp → app/artic-tools.cpp b/app/artic_tools.cpp → app/artic-tools.cpp
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -3,20 +3,20 @@ file(
   "${PROJECT_SOURCE_DIR}/tests/*.[ch]pp"
 )
 
-add_executable(artic_tests ${TEST_FILES})
+add_executable(artic-tools_tests ${TEST_FILES})
 
 target_link_libraries(
-  artic_tests
+  artic-tools_tests
   artic_static 
   gtest
   gtest_main
 )
 
 file(COPY data DESTINATION .)
 target_compile_definitions(
-  artic_tests 
+  artic-tools_tests 
   PRIVATE 
   TEST_DATA_PATH="${PROJECT_SOURCE_DIR}/tests/data/"
 )
 
-gtest_add_tests(TARGET artic_tests)
+gtest_add_tests(TARGET artic-tools_tests)