From 084bbc0fb8c80eade8c41cde5fbe6081885b5062 Mon Sep 17 00:00:00 2001 From: Nicolas Cornu Date: Fri, 25 Aug 2017 10:22:27 +0200 Subject: [PATCH] Fix different things --- CMakeLists.txt | 91 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 88 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f6165b5c..75a3b04d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -70,7 +70,7 @@ foreach(example_source_file ${EXAMPLES_SRC}) message(STATUS "${example_source_file}") get_filename_component(example_name ${example_source_file} NAME_WE) add_executable(${example_name} ${example_source_file}) - target_link_libraries(${example_name} ${LUA_LIBRARY}) + target_link_libraries(${example_name} ${LUA_LIBRARIES}) install(TARGETS ${example_name} RUNTIME DESTINATION bin/examples) endforeach() @@ -92,7 +92,92 @@ add_executable(tests ${TEST_SRC}) target_include_directories(tests PRIVATE ./Catch/include/) find_package(Threads) -target_link_libraries(tests Threads::Threads ${LUA_LIBRARY}) +target_link_libraries(tests Threads::Threads ${LUA_LIBRARIES}) install(TARGETS tests RUNTIME DESTINATION bin) -install(FILES "single/sol/sol.hpp" DESTINATION include) +set(HEADER_SRCS sol/as_args.hpp + sol/as_returns.hpp + sol/bind_traits.hpp + sol/call.hpp + sol/compatibility/5.0.0.h + sol/compatibility/5.1.0.h + sol/compatibility/5.2.0.h + sol/compatibility/5.x.x.h + sol/compatibility/5.x.x.inl + sol/compatibility/version.hpp + sol/compatibility.hpp + sol/container_traits.hpp + sol/container_usertype_metatable.hpp + sol/coroutine.hpp + sol/debug.hpp + sol/demangle.hpp + sol/deprecate.hpp + sol/environment.hpp + sol/error.hpp + sol/feature_test.hpp + sol/filters.hpp + sol/forward_detail.hpp + sol/forward.hpp + sol/function.hpp + sol/function_result.hpp + sol/function_types_core.hpp + sol/function_types.hpp + sol/function_types_overloaded.hpp + sol/function_types_stateful.hpp + sol/function_types_stateless.hpp + sol/function_types_templated.hpp + sol/inheritance.hpp + sol/in_place.hpp + sol/load_result.hpp + sol/object_base.hpp + sol/object.hpp + sol/optional.hpp + sol/optional_implementation.hpp + sol/overload.hpp + sol/property.hpp + sol/protected_function.hpp + sol/protected_function_result.hpp + sol/protect.hpp + sol/proxy_base.hpp + sol/proxy.hpp + sol/raii.hpp + sol/reference.hpp + sol/resolve.hpp + sol/simple_usertype_metatable.hpp + sol/stack_check_get.hpp + sol/stack_check.hpp + sol/stack_core.hpp + sol/stack_field.hpp + sol/stack_get.hpp + sol/stack_guard.hpp + sol/stack.hpp + sol/stack_pop.hpp + sol/stack_probe.hpp + sol/stack_proxy.hpp + sol/stack_push.hpp + sol/stack_reference.hpp + sol/state.hpp + sol/state_view.hpp + sol/string_shim.hpp + sol/table_core.hpp + sol/table.hpp + sol/table_iterator.hpp + sol/thread.hpp + sol/tie.hpp + sol/traits.hpp + sol/tuple.hpp + sol/types.hpp + sol/unsafe_function.hpp + sol/userdata.hpp + sol/usertype_core.hpp + sol/usertype.hpp + sol/usertype_metatable.hpp + sol/usertype_traits.hpp + sol/variadic_args.hpp + sol/variadic_results.hpp + sol/wrapper.hpp) + +find_package(PythonInterp 3 REQUIRED) +add_custom_command(OUTPUT sol.hpp COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/single.py --output ${CMAKE_CURRENT_BINARY_DIR}/sol.hpp DEPENDS ${HEADER_SRCS}) +add_custom_target(single_sol DEPENDS sol.hpp) +install(FILES "${CMAKE_CURRENT_BINARY_DIR}/sol.hpp" DESTINATION include)