-
Notifications
You must be signed in to change notification settings - Fork 1.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Updating imagl recipe for conan 2.0 #16698
Conversation
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There's a few things that should be cleaned up, but it looks pretty good already. Thanks!
recipes/imagl/all/conanfile.py
Outdated
|
||
required_conan_version = ">=1.33.0" | ||
required_conan_version = ">=1.59" | ||
|
||
|
||
class ImaglConan(ConanFile): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The homepage
attribute should be https://gitlab-lepuy.iut.uca.fr/opengl/imagl
, right?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Both are OK. https://gitlab-lepuy.iut.uca.fr/opengl/imagl is mirrored to https://github.com/Woazim/imaGL.
I think that people are more used to github than to my own GitLab instance.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Woazim in case https://github.com/Woazim/imaGL is a mirror, please, revert the conandata.yml. Mirror are welcome, but not as main link and they should keep same checksum: https://github.com/conan-io/conan-center-index/blob/master/docs/adding_packages/conandata_yml_format.md#mirrors
My mistake, I misread the statement, you are the real author actually.
recipes/imagl/all/conanfile.py
Outdated
|
||
required_conan_version = ">=1.33.0" | ||
required_conan_version = ">=1.59" | ||
|
||
|
||
class ImaglConan(ConanFile): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The License is also wrong. It should be lgpl-3.0-only
from what I can tell.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Right!!! What a mistake!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry, I messed up there by writing the lgpl
part of the license in lowercase. It should probably be uppercase, i.e. LGPL-3.0-only
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, I've just made the change. I hope that this is what blocks CI build with 'Invalid JSON String"...
By the way, I've changed source urls to github ones since my gitlab instance is temporarily down 😢
recipes/imagl/all/conanfile.py
Outdated
@@ -24,18 +29,9 @@ class ImaglConan(ConanFile): | |||
"with_png": True, | |||
"with_jpeg": True, | |||
} | |||
generators = "cmake" | |||
exports_sources = ["CMakeLists.txt", "patches/**"] | |||
exports_sources = "patches/**" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you remove this line? It shouldn't be necessary when using export_conandata_patches
.
exports_sources = "patches/**" |
|
||
add_executable(example example.cpp) | ||
target_link_libraries(example ${CONAN_LIBS}) | ||
target_link_libraries(example imagl::imagl) | ||
set_target_properties(example PROPERTIES CXX_STANDARD 20 CXX_STANDARD_REQUIRED ON) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
set_target_properties(example PROPERTIES CXX_STANDARD 20 CXX_STANDARD_REQUIRED ON) | |
target_compile_features(example PRIVATE cxx_std_20) |
cmake_minimum_required(VERSION 3.1) | ||
project(PackageTest CXX) | ||
|
||
include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) | ||
conan_basic_setup() | ||
|
||
add_executable(example ../test_package/example.cpp) | ||
target_link_libraries(example ${CONAN_LIBS}) | ||
set_target_properties(example PROPERTIES CXX_STANDARD 20 CXX_STANDARD_REQUIRED ON) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
cmake_minimum_required(VERSION 3.1) | |
project(PackageTest CXX) | |
include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) | |
conan_basic_setup() | |
add_executable(example ../test_package/example.cpp) | |
target_link_libraries(example ${CONAN_LIBS}) | |
set_target_properties(example PROPERTIES CXX_STANDARD 20 CXX_STANDARD_REQUIRED ON) | |
cmake_minimum_required(VERSION 3.15) | |
project(test_package) | |
include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) | |
conan_basic_setup(TARGETS) | |
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../test_package/ | |
${CMAKE_CURRENT_BINARY_DIR}/test_package/) |
recipes/imagl/all/conanfile.py
Outdated
|
||
self._cmake.definitions["STATIC_LIB"] = not self.options.shared | ||
self._cmake.definitions["SUPPORT_PNG"] = self.options.with_png | ||
get(self, **self.conan_data["sources"][self.version], destination=self.source_folder, strip_root=True) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This can be simplified.
get(self, **self.conan_data["sources"][self.version], destination=self.source_folder, strip_root=True) | |
get(self, **self.conan_data["sources"][self.version], strip_root=True) |
recipes/imagl/all/conanfile.py
Outdated
|
||
required_conan_version = ">=1.33.0" | ||
required_conan_version = ">=1.59" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It doesn't look like 1.59
is necessary here.
required_conan_version = ">=1.59" | |
required_conan_version = ">=1.53.0" |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
It seems that Windows builds are not starting... Why? |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
I detected other pull requests that are modifying imagl/all recipe:
This message is automatically generated by https://github.com/ericLemanissier/conan-center-conflicting-prs so don't hesitate to report issues/improvements there. |
recipes/imagl/all/conanfile.py
Outdated
|
||
required_conan_version = ">=1.33.0" | ||
required_conan_version = ">=1.59" | ||
|
||
|
||
class ImaglConan(ConanFile): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry, I messed up there by writing the lgpl
part of the license in lowercase. It should probably be uppercase, i.e. LGPL-3.0-only
.
This comment has been minimized.
This comment has been minimized.
Conan v1 pipeline ✔️All green in build 4 (
Conan v2 pipeline ❌
The v2 pipeline failed. Please, review the errors and note this will be required for pull requests to be merged in the near future. See details:Failure in build 5 (
Note: To save resources, CI tries to finish as soon as an error is found. For this reason you might find that not all the references have been launched or not all the configurations for a given reference. Also, take into account that we cannot guarantee the order of execution as it depends on CI workload and workers availability. |
Unfortunately Github closed this PR when I pushed some fixes to the original branch and I can not re-open it! |
We have recollected the commits of this PR in a new PR at #19614 |
imagl/0.2.1
I've updated this recipe for conan 2.0. Most of changes are induced from cmake_lib template.