first big sol3 push... tests not updated yet

.clang-format

@@ -1,4 +1,4 @@
-# # # # sol2
+# # # # sol3
 # The MIT License (MIT)
 # 
 # Copyright (c) 2013-2018 Rapptz, ThePhD, and contributors

.gitignore

@@ -1,4 +1,4 @@
-# # # # sol2
+# # # # sol3
 # The MIT License (MIT)
 # 
 # Copyright (c) 2013-2018 Rapptz, ThePhD, and contributors
@@ -98,7 +98,6 @@ lua-5.1.5/
 LuaJIT-2.1.0/
 luajit-2.0.5/
 luajit-2.0.3/
-include/
 liblua.a
 lib/liblua5.2.a
 

.travis.yml

@@ -1,4 +1,4 @@
-# # # # sol2
+# # # # sol3
 # The MIT License (MIT)
 # 
 # Copyright (c) 2013-2018 Rapptz, ThePhD, and contributors

CMakeLists.txt

@@ -1,4 +1,4 @@
-# # # # sol2
+# # # # sol3
 # The MIT License (MIT)
 # 
 # Copyright (c) 2013-2018 Rapptz, ThePhD, and contributors
@@ -20,7 +20,7 @@
 # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-# # # # sol2
+# # # # sol3
 # # # Required minimum version statement
 cmake_minimum_required(VERSION 3.5.0)
 
@@ -145,7 +145,7 @@ set_target_properties(sol2
 	EXPORT_NAME sol2::sol2)
 
 target_include_directories(sol2 INTERFACE
-	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
 	$<INSTALL_INTERFACE:include>)
 
 # # Version configurations
@@ -197,19 +197,19 @@ set(SOL2_DOCS_FOUND FALSE)
 if (PYTHONINTERP_FOUND)
 	if (SINGLE)
 		set(SOL2_SINGLE_FOUND TRUE)
-		add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/single/sol.hpp" "${CMAKE_CURRENT_BINARY_DIR}/single/sol_forward.hpp"
-			COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/single"
-			COMMAND ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/single.py" --output "${CMAKE_CURRENT_BINARY_DIR}/single/sol.hpp")
+		add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/single/sol/sol.hpp" "${CMAKE_CURRENT_BINARY_DIR}/single/sol/sol_forward.hpp"
+			COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/sol/single"
+			COMMAND ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/single.py" --output "${CMAKE_CURRENT_BINARY_DIR}/single/sol/sol.hpp")
 		add_custom_target(sol2_single_header ALL
-			DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/single/sol.hpp" "${CMAKE_CURRENT_BINARY_DIR}/single/sol_forward.hpp")
+			DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/single/sol/sol.hpp" "${CMAKE_CURRENT_BINARY_DIR}/single/sol/sol_forward.hpp")
 		add_library(sol2_single INTERFACE)
 		add_library(sol2::sol2_single ALIAS sol2_single)
 		set_target_properties(sol2_single
 			PROPERTIES
 			EXPORT_NAME sol2::sol2_single
-			INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_BINARY_DIR}/single")
+			INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_BINARY_DIR}/single/")
 		add_dependencies(sol2_single sol2_single_header)
-		install(FILES "${CMAKE_CURRENT_BINARY_DIR}/single/sol.hpp" "${CMAKE_CURRENT_BINARY_DIR}/single/sol_forward.hpp"
+		install(FILES "${CMAKE_CURRENT_BINARY_DIR}/single/sol/sol.hpp" "${CMAKE_CURRENT_BINARY_DIR}/single/sol/sol_forward.hpp"
 			DESTINATION include/sol/single/sol)
 	endif()
 	if (DOCS)

README.md

@@ -16,7 +16,7 @@ Find it [here](http://sol2.rtfd.io/). A run-through kind of tutorial is [here](h
 ## Sneak Peek
 
 ```cpp
-#include <sol.hpp>
+#include <sol/sol.hpp>
 #include <cassert>
 
 int main() {
@@ -29,7 +29,7 @@ int main() {
 ```
 
 ```cpp
-#include <sol.hpp>
+#include <sol/sol.hpp>
 #include <cassert>
 
 struct vars {

appveyor.yml

@@ -1,4 +1,4 @@
-# # # # sol2
+# # # # sol3
 # The MIT License (MIT)
 # 
 # Copyright (c) 2013-2018 Rapptz, ThePhD, and contributors

cmake/Modules/FindCatch.cmake

@@ -1,4 +1,4 @@
-# # # # sol2
+# # # # sol3
 # The MIT License (MIT)
 #
 # Copyright (c) 2013-2018 Rapptz, ThePhD, and contributors

cmake/Modules/FindKaguyaBuild.cmake

@@ -1,5 +1,5 @@
 
-# # # # sol2
+# # # # sol3
 # The MIT License (MIT)
 #
 # Copyright (c) 2013-2018 Rapptz, ThePhD, and contributors

cmake/Modules/FindLuaBridgeBuild.cmake

@@ -1,4 +1,4 @@
-# # # # sol2
+# # # # sol3
 # The MIT License (MIT)
 #
 # Copyright (c) 2013-2018 Rapptz, ThePhD, and contributors

cmake/Modules/FindLuaBuild.cmake

@@ -1,4 +1,4 @@
-# # # # sol2
+# # # # sol3
 # The MIT License (MIT)
 #
 # Copyright (c) 2013-2018 Rapptz, ThePhD, and contributors

cmake/Modules/FindLuwraBuild.cmake

@@ -1,4 +1,4 @@
-# # # # sol2
+# # # # sol3
 # The MIT License (MIT)
 #
 # Copyright (c) 2013-2018 Rapptz, ThePhD, and contributors

cmake/Modules/FindToLuappBuild.cmake

@@ -1,4 +1,4 @@
-# # # # sol2
+# # # # sol3
 # The MIT License (MIT)
 #
 # Copyright (c) 2013-2018 Rapptz, ThePhD, and contributors

cmake/sol2-config.cmake.in

@@ -1,4 +1,4 @@
-# # # # sol2
+# # # # sol3
 # The MIT License (MIT)
 # 
 # Copyright (c) 2013-2018 Rapptz, ThePhD, and contributors

docs/source/api/this_environment.rst

@@ -9,7 +9,7 @@ Sometimes in C++ it's useful to know where a Lua call is coming from and what :d
 	:linenos:
 
 	#define SOL_CHECK_ARGUMENTS
-	#include <sol.hpp>
+	#include <sol/sol.hpp>
 
 	#include <iostream>
 

docs/source/tutorial/all-the-things.rst

@@ -14,7 +14,7 @@ These are all the things. Use your browser's search to find things you want.
 asserts / prerequisites
 -----------------------
 
-You'll need to ``#include <sol.hpp>``/``#include "sol.hpp"`` somewhere in your code. Sol is header-only, so you don't need to compile anything. However, **Lua must be compiled and available**. See the :doc:`getting started tutorial<getting-started>` for more details.
+You'll need to ``#include <sol/sol.hpp>``/``#include "sol.hpp"`` somewhere in your code. Sol is header-only, so you don't need to compile anything. However, **Lua must be compiled and available**. See the :doc:`getting started tutorial<getting-started>` for more details.
 
 The implementation for ``assert.hpp`` with ``c_assert`` looks like so:
 

docs/source/tutorial/cxx-in-lua.rst

@@ -93,7 +93,7 @@ To do this, you bind things using the ``new_usertype`` and ``set_usertype`` meth
 .. code-block:: cpp
 	:caption: player_script.cpp
 
-	#include <sol.hpp>
+	#include <sol/sol.hpp>
 
 	int main () {
 		sol::state lua;

docs/source/tutorial/functions.rst

@@ -13,7 +13,7 @@ Given a C++ function, you can drop it into Sol in several equivalent ways, worki
 	:caption: Registering C++ functions
 	:name: writing-functions
 
-	#include <sol.hpp>
+	#include <sol/sol.hpp>
 
 	std::string my_function( int a, std::string b ) {
 		// Create a string with the letter 'D' "a" times,

docs/source/tutorial/getting-started.rst

@@ -16,7 +16,7 @@ When you're ready, try compiling this short snippet:
 	:caption: test.cpp: the first snippet
 	:name: the-first-snippet
 
-	#include <sol.hpp> // or #include "sol.hpp", whichever suits your needs
+	#include <sol/sol.hpp> // or #include "sol.hpp", whichever suits your needs
 
 	int main (int argc, char* argv[]) {
 
@@ -47,7 +47,7 @@ The second line opens a single lua-provided library, "base". There are several o
 	:caption: test.cpp: the first snippet
 	:name: the-second-snippet
 
-	#include <sol.hpp>
+	#include <sol/sol.hpp>
 
 	int main (int argc, char* argv[]) {
 

docs/source/tutorial/variables.rst

@@ -19,7 +19,7 @@ reading
 	:name: variables-main-cpp
 
 	#define SOL_CHECK_ARGUMENTS 1
-	#include <sol.hpp>
+	#include <sol/sol.hpp>
 	
 	
 	int main () {
@@ -37,7 +37,7 @@ You can interact with the variables like this:
 	:name: extended-variables-main-cpp
 
 	#define SOL_CHECK_ARGUMENTS 1
-	#include <sol.hpp>
+	#include <sol/sol.hpp>
 
 	#include <tuple>
 	#include <utility> // for std::pair
@@ -121,7 +121,7 @@ Writing gets a lot simpler. Even without scripting a file or a string, you can r
 	:name: writing-main-cpp
 
 	#define SOL_CHECK_ARGUMENTS 1
-	#include <sol.hpp>
+	#include <sol/sol.hpp>
 	
 	#include <iostream>
 
@@ -166,7 +166,7 @@ This example pretty much sums up what can be done. Note that the syntax ``lua["n
 	:name: lazy-main-cpp
 
 	#define SOL_CHECK_ARGUMENTS 1
-	#include <sol.hpp>
+	#include <sol/sol.hpp>
 	
 	#include <iostream>
 
@@ -194,7 +194,7 @@ Finally, it's possible to erase a reference/variable by setting it to ``nil``, u
 	:name: erase-main-cpp
 
 	#define SOL_CHECK_ARGUMENTS 1
-	#include <sol.hpp>
+	#include <sol/sol.hpp>
 	
 	int main () {
 

examples/CMakeLists.txt

@@ -61,9 +61,9 @@ function (MAKE_EXAMPLE example_source_file is_single)
 		PROPERTIES
 		OUTPUT_NAME "${example_output_name}")
 	if (is_single)
-		target_link_libraries(${example_name} sol2_single)
+		target_link_libraries(${example_name} sol2::sol2_single)
 	else()
-		target_link_libraries(${example_name} sol2)
+		target_link_libraries(${example_name} sol2::sol2)
 	endif()
 	target_compile_features(${example_name} 
 		PRIVATE ${CXX_FEATURES})

examples/any_return.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include <iostream>
 #include "assert.hpp"

examples/args_from_container.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include <iostream>
 #include <vector>

examples/as_returns.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include "assert.hpp"
 

examples/basic.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include <iostream>
 #include "assert.hpp"

examples/c_array.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include "assert.hpp"
 

examples/c_call.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include "assert.hpp"
 

examples/calling_lua_functions.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include <iostream>
 

examples/config.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include "assert.hpp"
 #include <string>

examples/container_usertype_as_container.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include <vector>
 #include <numeric>

examples/container_with_pairs.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include "assert.hpp"
 

examples/containers.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include <vector>
 #include <iostream>

examples/containers_as_table.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include <vector>
 #include <map>

examples/coroutine.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include <string>
 #include <iostream>

examples/coroutine_state.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include "assert.hpp"
 #include <iostream>

examples/custom_global_transparent_argument.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 // Something that can't be collided with
 static const auto& script_key = "GlobalResource.MySpecialIdentifier123";

examples/custom_reader.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include "assert.hpp"
 

examples/customization.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include <iostream>
 #include "assert.hpp"

examples/customization_convert_on_get.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include <iostream>
 #include <iomanip>

examples/docs/as_function.cpp

@@ -1,10 +1,10 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 int main () {
 	struct callable {
 		int operator()( int a, bool b ) {
-			return a + b ? 10 : 20;
+			return a + (b ? 10 : 20);
 		}
 	};
 

examples/docs/as_function_usertype_member_variable.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 int main () {
 	class B {

examples/docs/as_table_ipairs.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include <vector>
 

examples/docs/inheritance.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 struct A { 
 	int a = 10;

examples/docs/my_panic.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 #include <iostream>
 
 inline void my_panic(sol::optional<std::string> maybe_msg) {

examples/docs/preparing_environments.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 int main (int, char*[]) {
 	sol::state lua;

examples/docs/references_in_lambdas.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include "../assert.hpp"
 

examples/docs/runtime_extension.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include <iostream>
 

examples/docs/simple_functions.cpp

@@ -1,6 +1,6 @@
 #define SOL_CHECK_ARGUMENTS 1
 
-#include <sol.hpp>
+#include <sol/sol.hpp>
 #include "../assert.hpp"
 
 int main() {

examples/docs/simple_structs.cpp

@@ -1,6 +1,6 @@
 #define SOL_CHECK_ARGUMENTS 1
 
-#include <sol.hpp>
+#include <sol/sol.hpp>
 #include "../assert.hpp"
 
 struct vars {

examples/docs/state_script_safe.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include <iostream>
 

examples/docs/state_transfer.cpp

@@ -1,6 +1,6 @@
 #define SOL_CHECK_ARGUMENTS 1
 
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include "../assert.hpp"
 #include <iostream>

examples/dynamic_object.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include <iostream>
 #include "assert.hpp"

examples/environment_snooping.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include "assert.hpp"
 #include <iostream>

examples/environment_state.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include <iostream>
 

examples/environment_state_2.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include <iostream>
 

examples/environments.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include <iostream>
 

examples/environments_on_functions.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include "assert.hpp"
 #include <iostream>

examples/error_handler.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include <iostream>
 

examples/exception_handler.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include "assert.hpp"
 

examples/functions.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include "assert.hpp"
 #include <iostream>

examples/functions_empty_arguments.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include "assert.hpp"
 #include <iostream>

examples/index_and_newindex_usertype.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include "assert.hpp"
 

examples/indirect_function_calls.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include "assert.hpp"
 #include <iostream>

examples/interop/LuaBridge/CMakeLists.txt

@@ -44,7 +44,7 @@ function (make_luabridge_interop_example target_library is_single)
 	endif()
 endfunction()
 
-make_luabridge_interop_example(sol2 FALSE)
+make_luabridge_interop_example(sol2::sol2 FALSE)
 if (SOL2_SINGLE_FOUND AND INTEROP_EXAMPLES_SINGLE)
-	make_luabridge_interop_example(sol2_single TRUE)
+	make_luabridge_interop_example(sol2::sol2_single TRUE)
 endif()

examples/interop/LuaBridge/LuaBridge.cpp

@@ -1,6 +1,6 @@
 #define SOL_CHECK_ARGUMENTS 1
 #define SOL_ENABLE_INTEROP 1 // MUST be defined to use interop features
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include <LuaBridge/LuaBridge.h>
 

examples/interop/kaguya/CMakeLists.txt

@@ -44,7 +44,7 @@ function (make_kaguya_interop_example target_library is_single)
 	endif()
 endfunction()
 
-make_kaguya_interop_example(sol2 FALSE)
+make_kaguya_interop_example(sol2::sol2 FALSE)
 if (SOL2_SINGLE_FOUND AND INTEROP_EXAMPLES_SINGLE)
-	make_kaguya_interop_example(sol2_single TRUE)
+	make_kaguya_interop_example(sol2::sol2_single TRUE)
 endif()

examples/interop/kaguya/kaguya.cpp

@@ -2,7 +2,7 @@
 
 #define SOL_CHECK_ARGUMENTS 1
 #define SOL_ENABLE_INTEROP 1 // MUST be defined to use interop features
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include <iostream>
 #include "../../assert.hpp"

examples/interop/luwra/CMakeLists.txt

@@ -44,7 +44,7 @@ function (make_luwra_interop_example target_library is_single)
 	endif()
 endfunction()
 
-make_luwra_interop_example(sol2 FALSE)
+make_luwra_interop_example(sol2::sol2 FALSE)
 if (SOL2_SINGLE_FOUND AND INTEROP_EXAMPLES_SINGLE)
-	make_luwra_interop_example(sol2_single TRUE)
+	make_luwra_interop_example(sol2::sol2_single TRUE)
 endif()

examples/interop/luwra/luwra.cpp

@@ -1,6 +1,6 @@
 #define SOL_CHECK_ARGUMENTS 1
 #define SOL_ENABLE_INTEROP 1 // MUST be defined to use interop features
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include <luwra.hpp>
 

examples/interop/tolua/CMakeLists.txt

@@ -44,7 +44,7 @@ function(make_tolua_interop_example target_library is_single)
 	endif()
 endfunction()
 
-make_tolua_interop_example(sol2 FALSE)
+make_tolua_interop_example(sol2::sol2 FALSE)
 if (SOL2_SINGLE_FOUND AND INTEROP_EXAMPLES_SINGLE)
-	make_tolua_interop_example(sol2_single TRUE)
+	make_tolua_interop_example(sol2::sol2_single TRUE)
 endif()

examples/interop/tolua/tolua.cpp

@@ -1,6 +1,6 @@
 #define SOL_CHECK_ARGUMENTS 1
 #define SOL_ENABLE_INTEROP 1 // MUST be defined to use interop features
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include "Player.h"
 #include <tolua++.h>

examples/metatable_customization.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include <iostream>
 

examples/metatable_key_low_level.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include "assert.hpp"
 

examples/multi_results.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include <tuple>
 #include "assert.hpp"

examples/optional_with_iteration.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include <string>
 #include <memory>

examples/overloading.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include "assert.hpp"
 #include <iostream>

examples/overloading_with_fallback.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include <iostream>
 

examples/overloading_with_members.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include "assert.hpp"
 

examples/overridable_function_members.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include <iostream>
 

examples/pairs.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include <map>
 #include <iostream>

examples/pairs_with_raw_functions.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include <map>
 #include <iostream>

examples/property.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include "assert.hpp"
 

examples/protect.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include "assert.hpp"
 

examples/protected_functions.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include <iostream>
 

examples/read_only.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include <iostream>
 

examples/require.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include "assert.hpp"
 #include <iostream>

examples/require_dll_example/CMakeLists.txt

@@ -67,8 +67,8 @@ function(make_require_from_dll_example target_lib is_single)
 	else()
 		target_link_libraries(${example_lib_name} PRIVATE ${LUA_LIBRARIES})
 	endif()
-	if (IS_X86)
-		target_compile_options(${example_lib_name} BEFORE PRIVATE -m32)
+	if (IS_X86)
+		target_compile_options(${example_lib_name} BEFORE PRIVATE -m32)
 	endif()
 	target_link_libraries(${example_lib_name} PRIVATE ${target_lib})
 	target_include_directories(${example_lib_name} PUBLIC "${LUA_INCLUDE_DIRS}")
@@ -101,7 +101,7 @@ function(make_require_from_dll_example target_lib is_single)
 	endif()
 endfunction()
 
-make_require_from_dll_example(sol2 FALSE)
+make_require_from_dll_example(sol2::sol2 FALSE)
 if (SOL2_SINGLE_FOUND AND DYNAMIC_LOADING_EXAMPLES_SINGLE)
-	make_require_from_dll_example(sol2_single TRUE)
+	make_require_from_dll_example(sol2::sol2_single TRUE)
 endif()

examples/require_dll_example/my_object.cpp

@@ -1,7 +1,7 @@
 #include "my_object.hpp"
 
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 namespace my_object {
 

examples/require_dll_example/require_from_dll.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include "my_object.hpp"
 #include "../assert.hpp"

examples/require_override_behavior.cpp

@@ -1,7 +1,7 @@
 // Thanks to OrfeasZ for their answer to
 // an issue for this example!
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include "assert.hpp"
 

examples/runtime_additions.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include "assert.hpp"
 #include <iostream>

examples/script_error_handling.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include "assert.hpp"
 #include <iostream>

examples/self_from_lua.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include "assert.hpp"
 

examples/shared_ptr.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include "assert.hpp"
 

examples/shared_ptr_modify_in_place.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include <iostream>
 

examples/singleton.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include <iostream>
 

examples/stack_aligned_function.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include "assert.hpp"
 

examples/static_variables.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include <iostream>
 #include "assert.hpp"

examples/table_proxy.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include "assert.hpp"
 

examples/tables.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include <string>
 #include <iostream>

examples/this_state.cpp

@@ -1,5 +1,5 @@
 #define SOL_CHECK_ARGUMENTS 1
-#include <sol.hpp>
+#include <sol/sol.hpp>
 
 #include "assert.hpp"