summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Added IntelCC as public generator (#9747)HEADupstream/release/1.41Francisco Ramírez2021-10-063-1/+68
| | | | | * Added IntelCC as public generator * Added a couple of IntelCC tests
* fix deactivation in .bat scripts (#9741)James2021-10-062-2/+6
|
* branched 1.41memsharded2021-10-051-1/+1
|
* Merge branch 'release/1.40' into developczoido2021-10-054-5/+49
|\
| * Check old cacert.pem before deleting when updating Conan (#9734)Carlos Zoido2021-10-053-5/+48
| | | | | | | | | | * new cacert migration * fix for py27
| * conan 1.40.4 (#9723)Carlos Zoido2021-10-042-1/+2
| |
* | VirtualRunEnv: avoid generating linux/mac env variables on Windows (#9678)César García Tapia2021-10-055-34/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * VirtualRunEnv: avoid generating LD_LIBRARY_PATH and DYLD_LIBRARY_PATH env variables on Windows * Fix some OS checks and add a test * Add minor check to fix test * Test fixes * Fix test * Test fixes * Fix test
* | Adding cpp_info objects model for linking object files (#9520)Carlos Zoido2021-10-058-7/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * new objects field and add to CMakeDeps * remove test * modify test * test objects with components * dont mix with flags * fix tests * try to pass * fix test * fix test * begin functional test * add test_package * complete test * try fix test * may fix win * try fix test * fix win test * update test * add missing components line * update tests * simplify test
* | fix generators_folder relative path to conanfile (#9668)James2021-10-0512-49/+177
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fix generators_folder relative path to conanfile * define generators_folder for package command * change new CMake.install to use cmake --install feature * quote path with spaces * condition to layout() and apply same to imports_folder * wip * wip * apply cmd_build layout only if not test * wip * wip * marking test to use cmake 3.20 * keep legacy test_package layout * wip * wip * wip * lets try again cmake 3.19 for iOS build * review
* | new tools.downloads integration and testing (#9715)James2021-10-0414-54/+522
| | | | | | | | | | * new tools.downloads * uncomment import
* | fixed clang tests in winmemsharded2021-10-041-1/+1
| |
* | tools.PkgConfig: honor PKG_CONFIG env var (#9627)ericLemanissier2021-10-011-3/+3
| |
* | Adding Intel oneAPI support (#9522)Francisco Ramírez2021-10-0116-31/+529
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Adding setvars load * Adding updates subsetting and intel oneAPI check for all the use cases * Completely refactored new intel modulel * Adding default path for Unix * Reverted to legacy code * Adding new intel-cc (Intel oneAPI) as a new compiler * Defining intel oneAPI flags * Avoid putting the legacy cppstd_flags. Raising an error in new Intel-oneAPI-compilers and macOS * Fixed minor bugs * Fixed bad env iteration * Improved intel oneAPI automatic folder search in Windows * Adding default group * Refactored intel module * Fixed bugs * Creating helper function to create simple env scripts * Command Adapted for Linux and Win * Adding runtime as settings and improving command() interface for Intel oneAPI * Fixed bad migration * Added several intel oneAPI unittests * Adding coding shebang * Added to conf the new settings * Added unittest for msbuild * Fixed possible corner-case for testing * Added tests for intel-cc flags * Adding update to legacy Intel * Changed runtime settings (clearer now) and pruned some useless tests * Fixed non-equal settings declaration * Added simple functional test * Fixed bad package id * Added mark tool for Intel oneAPI * Fixed new mark tool * Added xfail for now * Added update versions to intel oneAPI as well just to avoid future problems with other minors * Commented tool from conftest and refacted functional test * Using internal test assets * Removed bad intel oneAPI declaration in VCVars * Changed global names for Intel oneAPI * Rephrased docstring * Removed installation path helper method and setup fixture * Deleted useless imports * Simpler and more concise msg if not intel path Co-authored-by: Luis Martinez de Bartolome Izquierdo <lasote@gmail.com> Co-authored-by: Luis Martinez de Bartolome Izquierdo <lasote@gmail.com>
* | fix migrations settingsczoido2021-09-301-0/+2
| |
* | Merge branch 'release/1.40' into developczoido2021-09-302-1/+45
|\|
| * Added migration (#9697)Luis Martinez de Bartolome Izquierdo2021-09-302-1/+45
| |
| * conan 1.40.3czoido2021-09-302-1/+3
| |
* | MSBuildDeps handle build_requires executables (#9686)James2021-09-294-21/+190
| | | | | | | | | | | | | | | | | | * MSBuildDeps handle build_requires executables * fix py27 error * review * removed unused file
* | Support multiple toolchains in one recipe (#9688)Carlos Zoido2021-09-298-16/+199
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add namespace to file tools * add to cmake * add autotools and bazel * move tests * remove test * remove imports * minor changes
* | Exclude meson tests from not mainstrem OSS (#9687)Luis Martinez de Bartolome Izquierdo2021-09-291-0/+2
| |
* | fix: support components with symbolic imports like @libdirs. (#9667)JoachimKuebart-TomTom2021-09-292-0/+54
| | | | | | Signed-off-by: Joachim Kuebart <joachim.kuebart@tomtom.com>
* | Added xtensalx6 for ESP32/ESP8266 platforms (#7977)Denis2021-09-292-3/+122
| | | | | | | | | | | | | | | | | | * Added xtensalx6 for ESP32/ESP8266 platforms Removed xtensalx6 from arch_build Fixed passing unittests * Changed settings_1_41_1 -> settings_1_41_0
* | use cmake_find_root_path_mode_include_both (#9685)Luis Martinez de Bartolome Izquierdo2021-09-281-7/+5
| |
* | fixing conan.tools.files.patch (#9653)James2021-09-242-3/+2
| |
* | removing compiler tool mark (#9656)Carlos Zoido2021-09-2331-53/+0
| |
* | Improve error message (#9624)Martin Schulze2021-09-232-1/+18
| | | | | | | | | | | | | | | | | | * Improve error message Otherwise this would only print "ERROR: True" * add test Co-authored-by: memsharded <james@conan.io>
* | Merge branch 'release/1.40' into developczoido2021-09-212-2/+123
|\|
| * Merge pull request #9643 from czoido/add_support-for-xcode-13Carlos Zoido2021-09-212-2/+121
| |\ | | | | | | Add support for Xcode 13
| | * Add support for Xcode 13Jano Svitok2021-09-212-2/+121
| |/
| * conan 1.40.2czoido2021-09-212-1/+3
| |
* | Bugfix: PkgConfigDeps generator creates bad `Requires` references (#9635)Francisco Ramírez2021-09-202-13/+25
| | | | | | | | | | * Fixed bad pkg-config require names * Marked as staticmethod
* | Fix migration settings comparison (#9615)Carlos Zoido2021-09-203-2/+3
| | | | | | | | | | | | | | | | | | * fix migration settings comparison * add comment * add new line and literal comparison in test * remove comment
* | Merge branch 'release/1.40' into developczoido2021-09-1415-46/+164
|\|
| * release 1.40.1czoido2021-09-142-1/+3
| |
| * Change default cmake_layout() source folder (#9596)César García Tapia2021-09-145-31/+31
| |
| * not caching and overwriting CMAKE_XXX_INIT vars in CMakeToolchain (#9576)James2021-09-141-4/+4
| |
| * Use base_path as a relative folder from conanfile.source_folder (#9593)Luis Martinez de Bartolome Izquierdo2021-09-133-2/+48
| |
| * aggregate conf from build_requires earlier for declarative generators (#9573)James2021-09-132-3/+44
| |
| * qmake: fix sharedlinkFlags and exelinkflags (#9568)ericLemanissier2021-09-102-5/+33
| | | | | | related to conan-io/conan-center-index#7222
| * upgrade requests>=2.25 (#9562)James2021-09-101-1/+1
| |
* | fix test (#9605)Carlos Zoido2021-09-141-1/+1
| |
* | making new env multi (#9543)James2021-09-1418-84/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * making new env multi * fixing tests * fix lowercase file * fixing Win test * trying new group approach * fix autotools * more fix autotools * wip * fix autotools * review * remove unnecessary test filename for env
* | removing some legacy cmake from modern generators (#9604)James2021-09-134-16/+16
| |
* | updating test cmakedeps, requires cmake 3.15.7 (#9598)James2021-09-132-10/+10
| | | | | | | | | | | | | | * updating test cmakedeps, requries cmake 3.15.7 * remove patch * remove unnecessary generators
* | removing unused __future__ lib (#9563)James2021-09-102-3/+0
| |
* | testing that cmake_paths functionality is covered by CMakeToolchain (#9538)James2021-09-094-3/+137
| | | | | | | | | | | | | | * testing that cmake_paths functionality is covered by CMakeToolchain * add real helloConfig.cmake test * checking CMakeDeps has priority
* | Support other types of remote archives (#9530)el-g-12021-09-093-4/+31
| | | | | | | | | | * Support other types of remote archives * Use tgz_with_contents() for test
* | generate deactivate scripts by default in Env (#9539)James2021-09-092-6/+6
| |
* | Export to base src and test with git clone (#9536)Luis Martinez de Bartolome Izquierdo2021-09-072-2/+37
| | | | | | | | | | | | | | * Export to base src and test with git clone * Windows test * use init git repo
* | Merge branch 'release/1.40' into developczoido2021-09-063-14/+22
|\|