Init LuaDist for llthreads2-compat module.

3 files changed, 14 insertions, 6 deletions

diff --git a/.travis.yml b/.travis.yml
index 3bb3efa..4a3f495 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,7 +34,7 @@ script:
   # - ~/_tools/travis/travis build
   - ~/luadist _test install lua-5.1.5 -binary=false -verbose -DCMAKE_TOOLCHAIN_FILE=$TOOLFILE
   - ~/luadist _test make . -binary=false -verbose -DCMAKE_TOOLCHAIN_FILE=$TOOLFILE
-  - cd _test/share/lua-llthreads2/test
+  - cd _test/share/lua-llthreads2-compat/test
   - $TRAVIS_BUILD_DIR/_test/bin/lua test_table_copy.lua
   - $TRAVIS_BUILD_DIR/_test/bin/lua test_threads.lua
   - $TRAVIS_BUILD_DIR/_test/bin/lua test_llthreads.lua
@@ -56,7 +56,7 @@ after_script:
 # Only watch the master branch
 branches:
   only:
-    - dist-llthreads2
+    - dist-llthreads2-compat
 
 # Notify the LuaDist Dev group if needed
 notifications:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 596e496..8b98adc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required ( VERSION 2.8 )
 
-project ( lua-llthreads2 C )
+project ( lua-llthreads2-compat C )
 include ( cmake/dist.cmake )
 include ( lua )
 
@@ -11,7 +11,9 @@ include_directories ( ${CMAKE_CURRENT_SOURCE_DIR}/llthreads2/src )
 
 set ( LUA_LLTHREADS_SRC llthreads2/src/l52util.c llthreads2/src/llthread.c )
 
-install_lua_module ( llthreads2 ${LUA_LLTHREADS_SRC} LINK ${CMAKE_THREAD_LIBS_INIT} )
+install_lua_module ( llthreads ${LUA_LLTHREADS_SRC} LINK ${CMAKE_THREAD_LIBS_INIT} )
+
+set_target_properties ( llthreads PROPERTIES COMPILE_DEFINITIONS "LLTHREAD_MODULE_NAME=llthreads" )
 
 install_data ( llthreads2/COPYRIGHT.llthreads llthreads2/README.md llthreads2/LICENSE )
 install_test ( llthreads2/test/ )
diff --git a/dist.info b/dist.info
index 5dfdbaa..efcc861 100644
--- a/dist.info
+++ b/dist.info
@@ -1,4 +1,4 @@
-name = "lua-llthreads2"
+name = "lua-llthreads2-compat"
 version = "0.1.1"
 
 desc = "A simple Lua wrapper for pthreads & WIN32 threads."
@@ -9,4 +9,10 @@ maintainer = "Alexey Melnichuk"
 
 depends = {
   "lua > 5.1"
-}
\ No newline at end of file
+}
+
+-- Same modules names
+conflicts = {
+  "lua-llthreads"
+}
+