Change file structure

.gitmodules

@@ -1,9 +1,9 @@
-[submodule "src/sol"]
+[submodule "libs/sol"]
-	path = src/sol
+	path = libs/sol
 	url = https://github.com/ThePhD/sol2.git
-[submodule "tests/gtest"]
+[submodule "libs/gtest"]
-	path = tests/gtest
+	path = libs/gtest
 	url = https://github.com/google/googletest.git
-[submodule "lua-tests/luaunit"]
+[submodule "libs/luaunit"]
-	path = lua-tests/luaunit
+	path = libs/luaunit
 	url = https://github.com/bluebird75/luaunit

.travis.yml

@@ -29,7 +29,7 @@ matrix:
         - cmake -DLUA_INCLUDE_DIR="/usr/include/lua5.2" -DLUA_LIBRARY="/usr/lib/x86_64-linux-gnu/liblua5.2.so" ..
         - make -j4 all && make install
         - ./tests
-        - cd ../lua-tests/ && ./run_tests.lua
+        - ./run_tests.lua
     # Mac OS X / Clang 3.8
     - compiler: clang
       os: osx
@@ -42,4 +42,4 @@ matrix:
         - mkdir build_dir && cd build_dir
         - cmake .. && make -j4 all && make install
         - ./tests
-        - cd ../lua-tests && ./run_tests.lua
+        - ./run_tests.lua

CMakeLists.txt

@@ -8,11 +8,10 @@ if (NOT LUA_INCLUDE_DIR OR NOT LUA_LIBRARY)
     endif()
 endif()
 
-include_directories(src src/sol/single/sol ${LUA_INCLUDE_DIR})
+include_directories(src/cpp libs/sol/single/sol ${LUA_INCLUDE_DIR})
 
-FILE(GLOB SOURCES src/*.cpp src/*.h)
+FILE(GLOB SOURCES src/cpp/*.cpp src/cpp/*.h)
-
+FILE(GLOB LUA_SOURCES src/lua/*.lua)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/build)
 
 if(APPLE)
     # Supress warning CMP0042
@@ -31,8 +30,9 @@ set_target_properties(effil PROPERTIES COMPILE_FLAGS "${ENABLE_WARNINGS} ${GENER
 # TESTS ---
 #----------
 
-FILE(GLOB TEST_SOURCES tests/*.cpp)
+FILE(GLOB TEST_SOURCES tests/cpp/*.cpp tests/cpp/*.h)
-set(GTEST_DIR tests/gtest/googletest)
+FILE(GLOB LUA_TEST_SOURCES tests/lua/*.lua)
+set(GTEST_DIR libs/gtest/googletest)
 
 include_directories(${GTEST_DIR}/include ${GTEST_DIR})
 add_executable(tests ${TEST_SOURCES} ${GTEST_DIR}/src/gtest-all.cc)
@@ -43,5 +43,6 @@ set_target_properties(tests PROPERTIES COMPILE_FLAGS "${ENABLE_WARNINGS} ${GENER
 #----------
 # INSTALL -
 #----------
-
+install(FILES ${LUA_SOURCES} ${LUA_TEST_SOURCES}
-install(FILES ${LUA_SOURCES} DESTINATION ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
+        DESTINATION ${CMAKE_BINARY_DIR}
+        PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ)

build.sh

@@ -1,12 +0,0 @@
-#!/bin/sh
-ROOT_DIR=$( cd $(dirname $0); pwd )
-WORK_DIR=$ROOT_DIR/.work_dir
-
-if ! [ -d $WORK_DIR ]; then
-    mkdir $WORK_DIR
-fi
-
-cd $WORK_DIR
-cmake $ROOT_DIR
-make -j4
-make install

libs/gtest

@@ -0,0 +1 @@
+Subproject commit 9ae086a9ebafabdc49b71bb7f3879f551adee09a

libs/sol

@@ -0,0 +1 @@
+Subproject commit 5b12924d9eab43b9621b8784b5ed576686c2fb50

src/sol

@@ -1 +0,0 @@
-Subproject commit 039331e163bb3a4870426e7b8ae7b55b53ecc579

tests/gtest

@@ -1 +0,0 @@
-Subproject commit 5e7fd50e17b6edf1cadff973d0ec68966cf3265e

tests/lua/run_tests.lua

@@ -1,7 +1,10 @@
 #!/usr/bin/env lua
 
-package.cpath = package.cpath .. ";../build/?.so;;../build/?.dylib"
+-- TODO: remove hardcode
-test = require "luaunit.luaunit"
+package.path  = package.path .. ";../libs/luaunit/?.lua"
+package.cpath = package.cpath .. ";./?.so;./?.dylib"
+
+test = require "luaunit"
 
 do
     -- Hack input arguments to make tests verbose by default