mirror of
				https://github.com/XRPLF/rippled.git
				synced 2025-11-04 11:15:56 +00:00 
			
		
		
		
	chore: Rename conan profile to default (#5599)
				
					
				
			This change renames the `libxrpl` profile to `default` to make it more usable.
This commit is contained in:
		
							
								
								
									
										2
									
								
								.github/workflows/macos.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/macos.yml
									
									
									
									
										vendored
									
									
								
							@@ -24,8 +24,6 @@ env:
 | 
			
		||||
  CONAN_GLOBAL_CONF: |
 | 
			
		||||
    core.download:parallel={{os.cpu_count()}}
 | 
			
		||||
    core.upload:parallel={{os.cpu_count()}}
 | 
			
		||||
    core:default_build_profile=libxrpl
 | 
			
		||||
    core:default_profile=libxrpl
 | 
			
		||||
    tools.build:jobs={{ (os.cpu_count() * 4/5) | int }}
 | 
			
		||||
    tools.build:verbosity=verbose
 | 
			
		||||
    tools.compilation:verbosity=verbose
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										2
									
								
								.github/workflows/nix.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/nix.yml
									
									
									
									
										vendored
									
									
								
							@@ -25,8 +25,6 @@ env:
 | 
			
		||||
  CONAN_GLOBAL_CONF: |
 | 
			
		||||
    core.download:parallel={{ os.cpu_count() }}
 | 
			
		||||
    core.upload:parallel={{ os.cpu_count() }}
 | 
			
		||||
    core:default_build_profile=libxrpl
 | 
			
		||||
    core:default_profile=libxrpl
 | 
			
		||||
    tools.build:jobs={{ (os.cpu_count() * 4/5) | int }}
 | 
			
		||||
    tools.build:verbosity=verbose
 | 
			
		||||
    tools.compilation:verbosity=verbose
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										2
									
								
								.github/workflows/windows.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/windows.yml
									
									
									
									
										vendored
									
									
								
							@@ -27,8 +27,6 @@ env:
 | 
			
		||||
  CONAN_GLOBAL_CONF: |
 | 
			
		||||
    core.download:parallel={{os.cpu_count()}}
 | 
			
		||||
    core.upload:parallel={{os.cpu_count()}}
 | 
			
		||||
    core:default_build_profile=libxrpl
 | 
			
		||||
    core:default_profile=libxrpl
 | 
			
		||||
    tools.build:jobs=24
 | 
			
		||||
    tools.build:verbosity=verbose
 | 
			
		||||
    tools.compilation:verbosity=verbose
 | 
			
		||||
 
 | 
			
		||||
@@ -9,6 +9,7 @@
 | 
			
		||||
[settings]
 | 
			
		||||
os={{ os }}
 | 
			
		||||
arch={{ arch }}
 | 
			
		||||
build_type=Debug
 | 
			
		||||
compiler={{compiler}}
 | 
			
		||||
compiler.version={{ compiler_version }}
 | 
			
		||||
compiler.cppstd=20
 | 
			
		||||
@@ -17,3 +18,20 @@ compiler.runtime=static
 | 
			
		||||
{% else %}
 | 
			
		||||
compiler.libcxx={{detect_api.detect_libcxx(compiler, version, compiler_exe)}}
 | 
			
		||||
{% endif %}
 | 
			
		||||
 | 
			
		||||
[conf]
 | 
			
		||||
{% if compiler == "clang" and compiler_version >= 19 %}
 | 
			
		||||
tools.build:cxxflags=['-Wno-missing-template-arg-list-after-template-kw']
 | 
			
		||||
{% endif %}
 | 
			
		||||
{% if compiler == "apple-clang" and compiler_version >= 17 %}
 | 
			
		||||
tools.build:cxxflags=['-Wno-missing-template-arg-list-after-template-kw']
 | 
			
		||||
{% endif %}
 | 
			
		||||
{% if compiler == "clang" and compiler_version == 16 %}
 | 
			
		||||
tools.build:cxxflags=['-DBOOST_ASIO_DISABLE_CONCEPTS']
 | 
			
		||||
{% endif %}
 | 
			
		||||
{% if compiler == "gcc" and compiler_version < 13 %}
 | 
			
		||||
tools.build:cxxflags=['-Wno-restrict']
 | 
			
		||||
{% endif %}
 | 
			
		||||
 | 
			
		||||
[tool_requires]
 | 
			
		||||
!cmake/*: cmake/[>=3 <4]
 | 
			
		||||
@@ -143,8 +143,6 @@ class Xrpl(ConanFile):
 | 
			
		||||
        tc.variables['static'] = self.options.static
 | 
			
		||||
        tc.variables['unity'] = self.options.unity
 | 
			
		||||
        tc.variables['xrpld'] = self.options.xrpld
 | 
			
		||||
        if self.settings.compiler == 'clang' and self.settings.compiler.version == 16:
 | 
			
		||||
            tc.extra_cxxflags = ["-DBOOST_ASIO_DISABLE_CONCEPTS"]
 | 
			
		||||
        tc.generate()
 | 
			
		||||
 | 
			
		||||
    def build(self):
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user