Updated wsjcpp.yml

Author: sea5kg

src.wsjcpp/CMakeLists.txt

@@ -2,7 +2,7 @@
 cmake_minimum_required(VERSION 3.0)
 
 add_definitions(-DWSJCPP_VERSION="v0.0.1")
-add_definitions(-DWSJCPP_NAME="wsjcpp/wsjcpp-hashes")
+add_definitions(-DWSJCPP_NAME="wsjcpp-hashes")
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
     set(MACOSX TRUE)
@@ -14,6 +14,9 @@ set (WSJCPP_LIBRARIES "")
 set (WSJCPP_INCLUDE_DIRS "")
 set (WSJCPP_SOURCES "")
 
+find_package(Threads REQUIRED)
+list (APPEND WSJCPP_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
+
 # wsjcpp-core:v0.0.4
 list (APPEND WSJCPP_INCLUDE_DIRS "./src.wsjcpp/wsjcpp_core/")
 list (APPEND WSJCPP_SOURCES "./src.wsjcpp/wsjcpp_core/wsjcpp_core.cpp")

unit-tests.wsjcpp/.gitignore

@@ -1,4 +1,8 @@
 tmp/*
 logs/*
 unit-tests
+.wsjcpp/*
+
+# Vim temp files
+*.swp
 

unit-tests.wsjcpp/CMakeLists.txt

@@ -1,7 +1,9 @@
 # Automaticly generated by [email protected]
 cmake_minimum_required(VERSION 3.0)
 
-project(unit-tests)
+project(unit-tests C CXX)
+add_definitions(-DWSJCPP_VERSION="ut-v0.0.1")
+add_definitions(-DWSJCPP_NAME="unit-tests-wsjcpp-hashes")
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
     set(MACOSX TRUE)
@@ -14,6 +16,9 @@ set (WSJCPP_LIBRARIES "")
 set (WSJCPP_INCLUDE_DIRS "")
 set (WSJCPP_SOURCES "")
 
+find_package(Threads REQUIRED)
+list (APPEND WSJCPP_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
+
 # wsjcpp-core:v0.0.4
 list (APPEND WSJCPP_INCLUDE_DIRS "../src.wsjcpp/wsjcpp_core/")
 list (APPEND WSJCPP_SOURCES "../src.wsjcpp/wsjcpp_core/wsjcpp_core.cpp")
@@ -22,7 +27,7 @@ list (APPEND WSJCPP_SOURCES "../src.wsjcpp/wsjcpp_core/wsjcpp_unit_tests.cpp")
 list (APPEND WSJCPP_SOURCES "../src.wsjcpp/wsjcpp_core/wsjcpp_unit_tests.h")
 list (APPEND WSJCPP_SOURCES "../src.wsjcpp/wsjcpp_core/wsjcpp_unit_tests_main.cpp")
 
-# wsjcpp/wsjcpp-hashes:v0.0.1
+# wsjcpp-hashes:v0.0.1
 list (APPEND WSJCPP_INCLUDE_DIRS "../src")
 list (APPEND WSJCPP_SOURCES "../src/md5.cpp")
 list (APPEND WSJCPP_SOURCES "../src/md5.h")
@@ -38,6 +43,8 @@ list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_md5.cpp")
 list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_sha1.h")
 list (APPEND WSJCPP_SOURCES "../unit-tests.wsjcpp/src/unit_test_sha1.cpp")
 
+include(${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.user-custom.txt)
+
 
 include_directories(${WSJCPP_INCLUDE_DIRS})
 
@@ -52,3 +59,4 @@ install(
         /usr/bin
 )
 
+

unit-tests.wsjcpp/CMakeLists.user-custom.txt

@@ -0,0 +1,2 @@
+## You can here write some custom includes
+

wsjcpp.yml

@@ -39,27 +39,21 @@ dependencies:
 distribution:
   - source-file: src/md5.cpp
     target-file: md5.cpp
-    sha1: "b9a2f18170280e20d001f3c8a41cb52f4c2428e8"
     type: "source-code"
   - source-file: src/md5.h
     target-file: md5.h
-    sha1: "6792979b9334d1853d3562fa17ca1db7de7d4ee3"
     type: "source-code"
   - source-file: src/smallsha1.h
     target-file: smallsha1.h
-    sha1: "44d204561dc64fdc0a603b02872f10cb6387e7c6"
     type: "source-code"
   - source-file: src/smallsha1.cpp
     target-file: smallsha1.cpp
-    sha1: "4ce3e44851139bdd2acd6c6e9a440a9c75022322"
     type: "source-code"
   - source-file: src/wsjcpp_hashes.cpp
     target-file: wsjcpp_hashes.cpp
-    sha1: "fbbd17bf3a73110c502676ee09e657711ce32bc1"
     type: "source-code"
   - source-file: src/wsjcpp_hashes.h
     target-file: wsjcpp_hashes.h
-    sha1: "35197d7d82ffb756b3af11021ee94c4dc68ddd0a"
     type: "source-code"
 
 unit-tests: