From 8f909dbea2c3c96a8b25ef6255e9ccbee707506b Mon Sep 17 00:00:00 2001 From: t0p4 Date: Mon, 12 Nov 2018 19:58:12 +0200 Subject: [PATCH 01/17] Add 'nlopt' package --- cmake/configs/default.cmake | 1 + cmake/projects/NLopt/hunter.cmake | 24 ++++++++++++++++++++++++ docs/packages/pkg/NLopt.rst | 21 +++++++++++++++++++++ examples/NLopt/CMakeLists.txt | 18 ++++++++++++++++++ examples/NLopt/boo.cpp | 4 ++++ 5 files changed, 68 insertions(+) create mode 100644 cmake/projects/NLopt/hunter.cmake create mode 100644 docs/packages/pkg/NLopt.rst create mode 100644 examples/NLopt/CMakeLists.txt create mode 100644 examples/NLopt/boo.cpp diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index 5c77f825a7..0c95dd3361 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -89,6 +89,7 @@ hunter_default_version(Lua VERSION 5.3.2-p2) hunter_default_version(Microsoft.GSL VERSION 2.0.0-p0) hunter_default_version(MySQL-client VERSION 6.1.9-p0) hunter_default_version(NASM VERSION 2.12.02) +hunter_default_version(NLopt VERSION 2.5.0) hunter_default_version(OpenAL VERSION 1.18.2) hunter_default_version(OpenBLAS VERSION 0.3.3) hunter_default_version(OpenCL VERSION 2.1-p3) diff --git a/cmake/projects/NLopt/hunter.cmake b/cmake/projects/NLopt/hunter.cmake new file mode 100644 index 0000000000..59bcbcd8d0 --- /dev/null +++ b/cmake/projects/NLopt/hunter.cmake @@ -0,0 +1,24 @@ +# Copyright (c) 2016-2018, Ruslan Baratov +# All rights reserved. + +# !!! DO NOT PLACE HEADER GUARDS HERE !!! + +include(hunter_add_version) +include(hunter_cacheable) +include(hunter_download) +include(hunter_pick_scheme) + +hunter_add_version( + PACKAGE_NAME + NLopt + VERSION + 2.5.0 + URL + "https://github.com/t0p4/nlopt/archive/v2.5.0-p11.tar.gz" + SHA1 + 31e99944214d49fc1ebf94980085ad2fc1708e13 +) + +hunter_pick_scheme(DEFAULT url_sha1_cmake) +hunter_cacheable(NLopt) +hunter_download(PACKAGE_NAME NLopt) diff --git a/docs/packages/pkg/NLopt.rst b/docs/packages/pkg/NLopt.rst new file mode 100644 index 0000000000..a7c2cb82ec --- /dev/null +++ b/docs/packages/pkg/NLopt.rst @@ -0,0 +1,21 @@ +.. spelling:: + + NLopt + +.. index:: + single: unsorted ; NLopt + +.. _pkg.NLopt: + +NLopt +===== + +- `Official `__ +- `Hunterized `__ +- `Example `__ +- Added by `NLopt_developer `__ (`pr-N `__) + +.. literalinclude:: /../examples/NLopt/CMakeLists.txt + :language: cmake + :start-after: # DOCUMENTATION_START { + :end-before: # DOCUMENTATION_END } diff --git a/examples/NLopt/CMakeLists.txt b/examples/NLopt/CMakeLists.txt new file mode 100644 index 0000000000..60a6f44c18 --- /dev/null +++ b/examples/NLopt/CMakeLists.txt @@ -0,0 +1,18 @@ +# Copyright (c) 2016-2018, Ruslan Baratov +# All rights reserved. + +cmake_minimum_required(VERSION 3.2) + +# Emulate HunterGate: +# * https://github.com/hunter-packages/gate +include("../common.cmake") + +project(download-nlopt) + +# DOCUMENTATION_START { +hunter_add_package(NLopt) +find_package(NLopt CONFIG REQUIRED) + +add_executable(boo boo.cpp) +target_link_libraries(boo PUBLIC NLopt::NLopt) +# DOCUMENTATION_END } diff --git a/examples/NLopt/boo.cpp b/examples/NLopt/boo.cpp new file mode 100644 index 0000000000..0ed0fa43b3 --- /dev/null +++ b/examples/NLopt/boo.cpp @@ -0,0 +1,4 @@ +#include + +int main() { +} From 537d765cc50ee70466dc41de752f4929e38ac6e6 Mon Sep 17 00:00:00 2001 From: t0p4 Date: Mon, 12 Nov 2018 20:08:21 +0200 Subject: [PATCH 02/17] add examples --- examples/NLopt/boo.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/NLopt/boo.cpp b/examples/NLopt/boo.cpp index 0ed0fa43b3..042db11d43 100644 --- a/examples/NLopt/boo.cpp +++ b/examples/NLopt/boo.cpp @@ -1,4 +1,4 @@ -#include +#include int main() { } From 8e67cc46ba60583d1998601f63d8e9905d548357 Mon Sep 17 00:00:00 2001 From: t0p4 Date: Mon, 12 Nov 2018 20:18:26 +0200 Subject: [PATCH 03/17] p11 --- examples/NLopt/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/NLopt/CMakeLists.txt b/examples/NLopt/CMakeLists.txt index 60a6f44c18..b270795ec9 100644 --- a/examples/NLopt/CMakeLists.txt +++ b/examples/NLopt/CMakeLists.txt @@ -14,5 +14,5 @@ hunter_add_package(NLopt) find_package(NLopt CONFIG REQUIRED) add_executable(boo boo.cpp) -target_link_libraries(boo PUBLIC NLopt::NLopt) +target_link_libraries(boo NLopt::nlopt) # DOCUMENTATION_END } From 768b71280c7d2b6aa305470987fdd34bc844f9ea Mon Sep 17 00:00:00 2001 From: t0p4 Date: Mon, 12 Nov 2018 20:30:08 +0200 Subject: [PATCH 04/17] p11 --- examples/NLopt/boo.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/NLopt/boo.cpp b/examples/NLopt/boo.cpp index 042db11d43..bc8637c242 100644 --- a/examples/NLopt/boo.cpp +++ b/examples/NLopt/boo.cpp @@ -1,4 +1,4 @@ -#include +#include int main() { } From 4d87193bc6653e1265a8a97dfaf63ca9afe70894 Mon Sep 17 00:00:00 2001 From: t0p4 Date: Mon, 12 Nov 2018 20:35:32 +0200 Subject: [PATCH 05/17] p11 --- examples/NLopt/boo.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/NLopt/boo.cpp b/examples/NLopt/boo.cpp index bc8637c242..826decf852 100644 --- a/examples/NLopt/boo.cpp +++ b/examples/NLopt/boo.cpp @@ -1,4 +1,4 @@ -#include +#include int main() { } From d1c5312df331a27299a1191feba41e81f35f274d Mon Sep 17 00:00:00 2001 From: t0p4 Date: Mon, 12 Nov 2018 21:00:23 +0200 Subject: [PATCH 06/17] p11 --- examples/NLopt/boo.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/NLopt/boo.cpp b/examples/NLopt/boo.cpp index 826decf852..02736022b5 100644 --- a/examples/NLopt/boo.cpp +++ b/examples/NLopt/boo.cpp @@ -1,4 +1,4 @@ -#include +#include int main() { } From 1ba266eb0eccfe8407e35617d682561226bde0e9 Mon Sep 17 00:00:00 2001 From: t0p4 Date: Mon, 12 Nov 2018 21:07:12 +0200 Subject: [PATCH 07/17] p --- examples/NLopt/boo.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/NLopt/boo.cpp b/examples/NLopt/boo.cpp index 02736022b5..e4a373d2e5 100644 --- a/examples/NLopt/boo.cpp +++ b/examples/NLopt/boo.cpp @@ -1,4 +1,4 @@ -#include +#include int main() { } From 23e5663cd228d74d7d02171a703dfbc5fbe68e79 Mon Sep 17 00:00:00 2001 From: t0p4 Date: Mon, 12 Nov 2018 21:12:28 +0200 Subject: [PATCH 08/17] p --- examples/NLopt/boo.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/NLopt/boo.cpp b/examples/NLopt/boo.cpp index e4a373d2e5..91c5173695 100644 --- a/examples/NLopt/boo.cpp +++ b/examples/NLopt/boo.cpp @@ -1,4 +1,4 @@ -#include +#include int main() { } From 0824b77430c9d635153b42427c1fde0500ab0fe8 Mon Sep 17 00:00:00 2001 From: t0p4 <> Date: Tue, 13 Nov 2018 09:44:42 +0200 Subject: [PATCH 09/17] NLopt Package --- cmake/projects/NLopt/hunter.cmake | 18 ++++++++++++++++-- examples/NLopt/CMakeLists.txt | 4 ++-- examples/NLopt/boo.cpp | 2 +- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/cmake/projects/NLopt/hunter.cmake b/cmake/projects/NLopt/hunter.cmake index 59bcbcd8d0..9267928ba0 100644 --- a/cmake/projects/NLopt/hunter.cmake +++ b/cmake/projects/NLopt/hunter.cmake @@ -7,6 +7,7 @@ include(hunter_add_version) include(hunter_cacheable) include(hunter_download) include(hunter_pick_scheme) +include(hunter_cmake_args) hunter_add_version( PACKAGE_NAME @@ -14,9 +15,22 @@ hunter_add_version( VERSION 2.5.0 URL - "https://github.com/t0p4/nlopt/archive/v2.5.0-p11.tar.gz" + "https://github.com/t0p4/nlopt/archive/v2.5.0-p12.tar.gz" SHA1 - 31e99944214d49fc1ebf94980085ad2fc1708e13 + 8743ed0f3fa342c924a5a4cddd6997740d6aaf20 +) + +hunter_cmake_args( + NLopt + CMAKE_ARGS + NLOPT_CXX=ON + BUILD_SHARED_LIBS=OFF + NLOPT_PYTHON=OFF + NLOPT_OCTAVE=OFF + NLOPT_MATLAB=OFF + NLOPT_GUILE=OFF + NLOPT_SWIG=OFF + NLOPT_TESTS=OFF ) hunter_pick_scheme(DEFAULT url_sha1_cmake) diff --git a/examples/NLopt/CMakeLists.txt b/examples/NLopt/CMakeLists.txt index b270795ec9..f1f12308c1 100644 --- a/examples/NLopt/CMakeLists.txt +++ b/examples/NLopt/CMakeLists.txt @@ -14,5 +14,5 @@ hunter_add_package(NLopt) find_package(NLopt CONFIG REQUIRED) add_executable(boo boo.cpp) -target_link_libraries(boo NLopt::nlopt) -# DOCUMENTATION_END } +target_link_libraries(boo PUBLIC NLopt::nlopt) +# DOCUMENTATION_END } \ No newline at end of file diff --git a/examples/NLopt/boo.cpp b/examples/NLopt/boo.cpp index 91c5173695..2d25712a31 100644 --- a/examples/NLopt/boo.cpp +++ b/examples/NLopt/boo.cpp @@ -1,4 +1,4 @@ -#include +#include int main() { } From f00442e6a3ba4057c56417ec37e0bad2e75567c7 Mon Sep 17 00:00:00 2001 From: t0p4 <> Date: Tue, 13 Nov 2018 09:46:14 +0200 Subject: [PATCH 10/17] NLopt Package --- cmake/projects/NLopt/hunter.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/projects/NLopt/hunter.cmake b/cmake/projects/NLopt/hunter.cmake index 9267928ba0..3478d78c5c 100644 --- a/cmake/projects/NLopt/hunter.cmake +++ b/cmake/projects/NLopt/hunter.cmake @@ -24,7 +24,7 @@ hunter_cmake_args( NLopt CMAKE_ARGS NLOPT_CXX=ON - BUILD_SHARED_LIBS=OFF + BUILD_SHARED_LIBS=ON NLOPT_PYTHON=OFF NLOPT_OCTAVE=OFF NLOPT_MATLAB=OFF From a4fa77c6c6e19a2ea4a1b40b34d9e9b0010e8ab3 Mon Sep 17 00:00:00 2001 From: t0p4 <> Date: Tue, 13 Nov 2018 10:06:20 +0200 Subject: [PATCH 11/17] Update --- cmake/projects/NLopt/hunter.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/projects/NLopt/hunter.cmake b/cmake/projects/NLopt/hunter.cmake index 3478d78c5c..a01439f48f 100644 --- a/cmake/projects/NLopt/hunter.cmake +++ b/cmake/projects/NLopt/hunter.cmake @@ -15,9 +15,9 @@ hunter_add_version( VERSION 2.5.0 URL - "https://github.com/t0p4/nlopt/archive/v2.5.0-p12.tar.gz" + "https://github.com/t0p4/nlopt/archive/v2.5.0-p13.tar.gz" SHA1 - 8743ed0f3fa342c924a5a4cddd6997740d6aaf20 + 7f77de623145ef1ed537ea4a732f23ff0abae83d ) hunter_cmake_args( From 127bcec5cf1af17dfaddf65fc790ec62b0639eee Mon Sep 17 00:00:00 2001 From: t0p4 <> Date: Tue, 13 Nov 2018 10:56:28 +0200 Subject: [PATCH 12/17] Add 'NLopt' package --- cmake/projects/NLopt/hunter.cmake | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/cmake/projects/NLopt/hunter.cmake b/cmake/projects/NLopt/hunter.cmake index a01439f48f..14c476b968 100644 --- a/cmake/projects/NLopt/hunter.cmake +++ b/cmake/projects/NLopt/hunter.cmake @@ -15,14 +15,12 @@ hunter_add_version( VERSION 2.5.0 URL - "https://github.com/t0p4/nlopt/archive/v2.5.0-p13.tar.gz" + "https://github.com/t0p4/nlopt/archive/v2.5.0-p0.tar.gz" SHA1 - 7f77de623145ef1ed537ea4a732f23ff0abae83d + 8b131a76bf1cad6af4a87c53c149d5e2e4d6c430 ) -hunter_cmake_args( - NLopt - CMAKE_ARGS +hunter_cmake_args(NLopt CMAKE_ARGS NLOPT_CXX=ON BUILD_SHARED_LIBS=ON NLOPT_PYTHON=OFF From 7815246da06015e17fa072ef73cb84de6f33f3c1 Mon Sep 17 00:00:00 2001 From: t0p4 <> Date: Tue, 13 Nov 2018 11:21:25 +0200 Subject: [PATCH 13/17] Pull request number --- docs/packages/pkg/NLopt.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/packages/pkg/NLopt.rst b/docs/packages/pkg/NLopt.rst index a7c2cb82ec..2d9863ac37 100644 --- a/docs/packages/pkg/NLopt.rst +++ b/docs/packages/pkg/NLopt.rst @@ -13,7 +13,7 @@ NLopt - `Official `__ - `Hunterized `__ - `Example `__ -- Added by `NLopt_developer `__ (`pr-N `__) +- Added by `NLopt_developer `__ (`pr-1617 `__) .. literalinclude:: /../examples/NLopt/CMakeLists.txt :language: cmake From 3f0ca0f7894482e4d9f8125c712e889806d1895e Mon Sep 17 00:00:00 2001 From: t0p4 <> Date: Tue, 13 Nov 2018 11:44:55 +0200 Subject: [PATCH 14/17] Update docs examples config --- cmake/projects/NLopt/hunter.cmake | 2 +- docs/packages/pkg/NLopt.rst | 4 ++-- examples/NLopt/CMakeLists.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/projects/NLopt/hunter.cmake b/cmake/projects/NLopt/hunter.cmake index 14c476b968..ccdc20cd55 100644 --- a/cmake/projects/NLopt/hunter.cmake +++ b/cmake/projects/NLopt/hunter.cmake @@ -13,7 +13,7 @@ hunter_add_version( PACKAGE_NAME NLopt VERSION - 2.5.0 + 2.5.0-p0 URL "https://github.com/t0p4/nlopt/archive/v2.5.0-p0.tar.gz" SHA1 diff --git a/docs/packages/pkg/NLopt.rst b/docs/packages/pkg/NLopt.rst index 2d9863ac37..1028b11d28 100644 --- a/docs/packages/pkg/NLopt.rst +++ b/docs/packages/pkg/NLopt.rst @@ -10,10 +10,10 @@ NLopt ===== -- `Official `__ +- `Official `__ - `Hunterized `__ - `Example `__ -- Added by `NLopt_developer `__ (`pr-1617 `__) +- Added by `NLopt_developer `__ (`pr-1617 `__) .. literalinclude:: /../examples/NLopt/CMakeLists.txt :language: cmake diff --git a/examples/NLopt/CMakeLists.txt b/examples/NLopt/CMakeLists.txt index f1f12308c1..c48c45f443 100644 --- a/examples/NLopt/CMakeLists.txt +++ b/examples/NLopt/CMakeLists.txt @@ -15,4 +15,4 @@ find_package(NLopt CONFIG REQUIRED) add_executable(boo boo.cpp) target_link_libraries(boo PUBLIC NLopt::nlopt) -# DOCUMENTATION_END } \ No newline at end of file +# DOCUMENTATION_END } From 283bed839898bec603ad6922d4566e6393ed73a8 Mon Sep 17 00:00:00 2001 From: t0p4 <> Date: Tue, 13 Nov 2018 12:25:47 +0200 Subject: [PATCH 15/17] Update docs --- cmake/configs/default.cmake | 2 +- cmake/projects/NLopt/hunter.cmake | 7 ++++--- docs/packages/pkg/NLopt.rst | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index 0c95dd3361..9d821788da 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -89,7 +89,7 @@ hunter_default_version(Lua VERSION 5.3.2-p2) hunter_default_version(Microsoft.GSL VERSION 2.0.0-p0) hunter_default_version(MySQL-client VERSION 6.1.9-p0) hunter_default_version(NASM VERSION 2.12.02) -hunter_default_version(NLopt VERSION 2.5.0) +hunter_default_version(NLopt VERSION 2.5.0-p0) hunter_default_version(OpenAL VERSION 1.18.2) hunter_default_version(OpenBLAS VERSION 0.3.3) hunter_default_version(OpenCL VERSION 2.1-p3) diff --git a/cmake/projects/NLopt/hunter.cmake b/cmake/projects/NLopt/hunter.cmake index ccdc20cd55..4088f22f41 100644 --- a/cmake/projects/NLopt/hunter.cmake +++ b/cmake/projects/NLopt/hunter.cmake @@ -15,13 +15,13 @@ hunter_add_version( VERSION 2.5.0-p0 URL - "https://github.com/t0p4/nlopt/archive/v2.5.0-p0.tar.gz" + "https://github.com/hunter-packages/nlopt/archive/v2.5.0-p0.tar.gz" SHA1 - 8b131a76bf1cad6af4a87c53c149d5e2e4d6c430 + 30838bcdc191b6dae8af1d0e8f704fe51a0ad3ef ) hunter_cmake_args(NLopt CMAKE_ARGS - NLOPT_CXX=ON + NLOPT_CXX=OFF BUILD_SHARED_LIBS=ON NLOPT_PYTHON=OFF NLOPT_OCTAVE=OFF @@ -29,6 +29,7 @@ hunter_cmake_args(NLopt CMAKE_ARGS NLOPT_GUILE=OFF NLOPT_SWIG=OFF NLOPT_TESTS=OFF + NLOPT_LINK_PYTHON=OFF ) hunter_pick_scheme(DEFAULT url_sha1_cmake) diff --git a/docs/packages/pkg/NLopt.rst b/docs/packages/pkg/NLopt.rst index 1028b11d28..67e8e4e08e 100644 --- a/docs/packages/pkg/NLopt.rst +++ b/docs/packages/pkg/NLopt.rst @@ -10,10 +10,10 @@ NLopt ===== -- `Official `__ +- `Official `__ - `Hunterized `__ - `Example `__ -- Added by `NLopt_developer `__ (`pr-1617 `__) +- Added by `t0p4 `__ (`pr-1617 `__) .. literalinclude:: /../examples/NLopt/CMakeLists.txt :language: cmake From b38d3ac7874809b8fa95dd2a6fea73b695935dd1 Mon Sep 17 00:00:00 2001 From: t0p4 <> Date: Tue, 13 Nov 2018 12:32:18 +0200 Subject: [PATCH 16/17] Update configs --- cmake/projects/NLopt/hunter.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/projects/NLopt/hunter.cmake b/cmake/projects/NLopt/hunter.cmake index 4088f22f41..1d163a991e 100644 --- a/cmake/projects/NLopt/hunter.cmake +++ b/cmake/projects/NLopt/hunter.cmake @@ -22,7 +22,7 @@ hunter_add_version( hunter_cmake_args(NLopt CMAKE_ARGS NLOPT_CXX=OFF - BUILD_SHARED_LIBS=ON + BUILD_SHARED_LIBS=OFF NLOPT_PYTHON=OFF NLOPT_OCTAVE=OFF NLOPT_MATLAB=OFF From efc76aa4516e8ce110adc8c876ec1bacc6da6ef4 Mon Sep 17 00:00:00 2001 From: t0p4 <> Date: Tue, 13 Nov 2018 13:12:05 +0200 Subject: [PATCH 17/17] Update Configs --- cmake/projects/NLopt/hunter.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/cmake/projects/NLopt/hunter.cmake b/cmake/projects/NLopt/hunter.cmake index 1d163a991e..9c4c3a93d4 100644 --- a/cmake/projects/NLopt/hunter.cmake +++ b/cmake/projects/NLopt/hunter.cmake @@ -22,7 +22,6 @@ hunter_add_version( hunter_cmake_args(NLopt CMAKE_ARGS NLOPT_CXX=OFF - BUILD_SHARED_LIBS=OFF NLOPT_PYTHON=OFF NLOPT_OCTAVE=OFF NLOPT_MATLAB=OFF