diff options
| author | Alexey Sokolov <alexey+gentoo@asokolov.org> | 2021-07-12 00:29:46 +0100 |
|---|---|---|
| committer | Ionen Wolkens <ionen@gentoo.org> | 2021-07-14 01:46:17 -0400 |
| commit | 35da96df067a8a2cb5f983830b0f63f744000820 (patch) | |
| tree | e667330ec0068352b85ba39edaf2a88f1bd42fa1 /dev-cpp/sol2/files | |
| parent | 7f5a950ad1ee6a45e3e13d3b7bf75104659e8682 (diff) | |
| download | gentoo-35da96df067a8a2cb5f983830b0f63f744000820.tar.gz gentoo-35da96df067a8a2cb5f983830b0f63f744000820.tar.bz2 gentoo-35da96df067a8a2cb5f983830b0f63f744000820.zip | |
dev-cpp/sol2: new package 3.2.2
games-engines/openmw-0.48 will depend on it
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Alexey Sokolov <alexey+gentoo@asokolov.org>
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
Diffstat (limited to 'dev-cpp/sol2/files')
| -rw-r--r-- | dev-cpp/sol2/files/sol2-3.2.2-catch-depend.patch | 27 | ||||
| -rw-r--r-- | dev-cpp/sol2/files/sol2-3.2.2-luajit-pkgconf.patch | 17 |
2 files changed, 44 insertions, 0 deletions
diff --git a/dev-cpp/sol2/files/sol2-3.2.2-catch-depend.patch b/dev-cpp/sol2/files/sol2-3.2.2-catch-depend.patch new file mode 100644 index 000000000000..2da3c00c1612 --- /dev/null +++ b/dev-cpp/sol2/files/sol2-3.2.2-catch-depend.patch @@ -0,0 +1,27 @@ +Use catch library from system + +--- a/tests/runtime_tests/CMakeLists.txt ++++ b/tests/runtime_tests/CMakeLists.txt +@@ -22,12 +22,6 @@ +
+ # # # # sol3 tests - runtime tests
+
+-if (CMAKE_GENERATOR MATCHES "Visual Studio 14 2015")
+- find_package(Catch 1.12.1 REQUIRED)
+-else()
+- find_package(Catch REQUIRED)
+-endif()
+-
+ file(GLOB SOL2_RUNTIME_TEST_SOURCES source/*.cpp)
+ source_group(test_sources FILES ${SOL2_RUNTIME_TEST_SOURCES})
+
+@@ -38,7 +32,8 @@ function(CREATE_TEST test_target_name test_name target_sol) + OUTPUT_NAME ${test_name}
+ EXPORT_NAME sol2::${test_name})
+ target_link_libraries(${test_target_name}
+- PUBLIC Threads::Threads ${LUA_LIBRARIES} ${CATCH_LIBRARIES} ${target_sol})
++ PUBLIC Threads::Threads ${LUA_LIBRARIES} ${target_sol})
++ target_include_directories(${test_target_name} PRIVATE ${CATCH_INC_DIR})
+
+ if (MSVC)
+ if (NOT CMAKE_COMPILER_ID MATCHES "Clang")
diff --git a/dev-cpp/sol2/files/sol2-3.2.2-luajit-pkgconf.patch b/dev-cpp/sol2/files/sol2-3.2.2-luajit-pkgconf.patch new file mode 100644 index 000000000000..9b9c9f101769 --- /dev/null +++ b/dev-cpp/sol2/files/sol2-3.2.2-luajit-pkgconf.patch @@ -0,0 +1,17 @@ +Use the lua version selected by lua eclass + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -188,7 +188,11 @@ if (SOL2_IS_TOP_LEVEL AND (SOL2_DO_TESTS OR SOL2_DO_EXAMPLES)) + + string(TOLOWER ${SOL2_LUA_VERSION} NORMALIZED_LUA_VERSION) + # Find way to get Lua: build if requested, or attempt to build if no matching version is found +- if (SOL2_BUILD_LUA) ++ if (TRUE) ++ find_package(PkgConfig REQUIRED) ++ pkg_check_modules(LUA REQUIRED lua IMPORTED_TARGET) ++ set(LUA_LIBRARIES PkgConfig::LUA) ++ elseif (SOL2_BUILD_LUA) + find_package(LuaBuild REQUIRED COMPONENTS ${SOL2_LUA_VERSION}) + elseif (NOT SOL2_LUA_VERSION) + find_package(LuaBuild REQUIRED) |