Merge pull request #235 from Esri/develop

Release 2.1

Jenkinsfile

@@ -5,15 +5,15 @@
 import groovy.transform.Field
 
 @Library('psl')
-import com.esri.zrh.jenkins.PipelineSupportLibrary
+import com.esri.zrh.jenkins.PipelineSupportLibrary as PSL
 import com.esri.zrh.jenkins.JenkinsTools
-import com.esri.zrh.jenkins.ce.CityEnginePipelineLibrary
+import com.esri.zrh.jenkins.ce.CityEnginePipelineLibrary as CEPL
 import com.esri.zrh.jenkins.ce.PrtAppPipelineLibrary as PAPL
 import com.esri.zrh.jenkins.PslFactory
 import com.esri.zrh.jenkins.psl.UploadTrackingPsl
 
 @Field def psl = PslFactory.create(this, UploadTrackingPsl.ID)
-@Field def cepl = new CityEnginePipelineLibrary(this, psl)
+@Field def cepl = new CEPL(this, psl)
 @Field def papl = new PAPL(cepl)
 
 
@@ -24,28 +24,29 @@ import com.esri.zrh.jenkins.psl.UploadTrackingPsl
 @Field final String BUILD_TARGET = 'package'
 @Field final String SOURCE_STASH = 'palladio-src'
 
-@Field final List CONFIGS_CHECKOUT = [ [ ba: psl.BA_CHECKOUT ] ]
+@Field final List CONFIGS_CHECKOUT = [ [ ba: PSL.BA_CHECKOUT ] ]
+@Field final Map DOCKER_IMAGE_LINUX_CONFIG = [ ba: PSL.BA_LINUX_DOCKER, containerId: "build_tools/ce-tc-prt:almalinux8-gcc11-v2", containerWorkspace: "/tmp/app" ]
 
 @Field final List CONFIGS_TEST = [
-	[ os: cepl.CFG_OS_RHEL7, bc: cepl.CFG_BC_REL, tc: cepl.CFG_TC_GCC93,  cc: cepl.CFG_CC_OPT, arch: cepl.CFG_ARCH_X86_64 ],
-	[ os: cepl.CFG_OS_WIN10, bc: cepl.CFG_BC_REL, tc: cepl.CFG_TC_VC1427, cc: cepl.CFG_CC_OPT, arch: cepl.CFG_ARCH_X86_64 ],
-]
-
-@Field final List CONFIGS_HOUDINI_185 = [
-	[ os: cepl.CFG_OS_RHEL7, bc: cepl.CFG_BC_REL, tc: cepl.CFG_TC_GCC93, cc: cepl.CFG_CC_OPT, arch: cepl.CFG_ARCH_X86_64, houdini: '18.5' ],
-	[ os: cepl.CFG_OS_WIN10, bc: cepl.CFG_BC_REL, tc: cepl.CFG_TC_VC1427, cc: cepl.CFG_CC_OPT, arch: cepl.CFG_ARCH_X86_64, houdini: '18.5' ],
+	DOCKER_IMAGE_LINUX_CONFIG + [ os: CEPL.CFG_OS_RHEL8, bc: CEPL.CFG_BC_REL, tc: CEPL.CFG_TC_GCC112, cc: CEPL.CFG_CC_OPT, arch: CEPL.CFG_ARCH_X86_64 ],
+	[ os: CEPL.CFG_OS_WIN10, bc: CEPL.CFG_BC_REL, tc: CEPL.CFG_TC_VC1437, cc: CEPL.CFG_CC_OPT, arch: CEPL.CFG_ARCH_X86_64 ],
 ]
 
 @Field final List CONFIGS_HOUDINI_190 = [
-	[ os: cepl.CFG_OS_RHEL7, bc: cepl.CFG_BC_REL, tc: cepl.CFG_TC_GCC93, cc: cepl.CFG_CC_OPT, arch: cepl.CFG_ARCH_X86_64, houdini: '19.0' ],
-	[ os: cepl.CFG_OS_WIN10, bc: cepl.CFG_BC_REL, tc: cepl.CFG_TC_VC1427, cc: cepl.CFG_CC_OPT, arch: cepl.CFG_ARCH_X86_64, houdini: '19.0' ],
+	DOCKER_IMAGE_LINUX_CONFIG + [ os: CEPL.CFG_OS_RHEL8, bc: CEPL.CFG_BC_REL, tc: CEPL.CFG_TC_GCC112, cc: CEPL.CFG_CC_OPT, arch: CEPL.CFG_ARCH_X86_64, houdini: '19.0' ],
+	[ os: CEPL.CFG_OS_WIN10, bc: CEPL.CFG_BC_REL, tc: CEPL.CFG_TC_VC1437, cc: CEPL.CFG_CC_OPT, arch: CEPL.CFG_ARCH_X86_64, houdini: '19.0' ],
 ]
 
 @Field final List CONFIGS_HOUDINI_195 = [
-	[ os: cepl.CFG_OS_RHEL7, bc: cepl.CFG_BC_REL, tc: cepl.CFG_TC_GCC93, cc: cepl.CFG_CC_OPT, arch: cepl.CFG_ARCH_X86_64, houdini: '19.5' ],
-	[ os: cepl.CFG_OS_WIN10, bc: cepl.CFG_BC_REL, tc: cepl.CFG_TC_VC1427, cc: cepl.CFG_CC_OPT, arch: cepl.CFG_ARCH_X86_64, houdini: '19.5' ],
-	[ grp: 'cesdkLatest', os: cepl.CFG_OS_RHEL7, bc: cepl.CFG_BC_REL, tc: cepl.CFG_TC_GCC93, cc: cepl.CFG_CC_OPT, arch: cepl.CFG_ARCH_X86_64, houdini: '19.5', cesdk: PAPL.Dependencies.CESDK_LATEST ],
-	[ grp: 'cesdkLatest', os: cepl.CFG_OS_WIN10, bc: cepl.CFG_BC_REL, tc: cepl.CFG_TC_VC1427, cc: cepl.CFG_CC_OPT, arch: cepl.CFG_ARCH_X86_64, houdini: '19.5', cesdk: PAPL.Dependencies.CESDK_LATEST ],
+	DOCKER_IMAGE_LINUX_CONFIG + [ os: CEPL.CFG_OS_RHEL8, bc: CEPL.CFG_BC_REL, tc: CEPL.CFG_TC_GCC112, cc: CEPL.CFG_CC_OPT, arch: CEPL.CFG_ARCH_X86_64, houdini: '19.5' ],
+	[ os: CEPL.CFG_OS_WIN10, bc: CEPL.CFG_BC_REL, tc: CEPL.CFG_TC_VC1437, cc: CEPL.CFG_CC_OPT, arch: CEPL.CFG_ARCH_X86_64, houdini: '19.5' ],
+]
+
+@Field final List CONFIGS_HOUDINI_200 = [
+	DOCKER_IMAGE_LINUX_CONFIG + [ os: CEPL.CFG_OS_RHEL8, bc: CEPL.CFG_BC_REL, tc: CEPL.CFG_TC_GCC112, cc: CEPL.CFG_CC_OPT, arch: CEPL.CFG_ARCH_X86_64, houdini: '20.0' ],
+	[ os: CEPL.CFG_OS_WIN10, bc: CEPL.CFG_BC_REL, tc: CEPL.CFG_TC_VC1437, cc: CEPL.CFG_CC_OPT, arch: CEPL.CFG_ARCH_X86_64, houdini: '20.0' ],
+	DOCKER_IMAGE_LINUX_CONFIG + [ grp: 'cesdkLatest', os: CEPL.CFG_OS_RHEL8, bc: CEPL.CFG_BC_REL, tc: CEPL.CFG_TC_GCC112, cc: CEPL.CFG_CC_OPT, arch: CEPL.CFG_ARCH_X86_64, houdini: '20.0', cesdk: PAPL.Dependencies.CESDK_LATEST ],
+	[ grp: 'cesdkLatest', os: CEPL.CFG_OS_WIN10, bc: CEPL.CFG_BC_REL, tc: CEPL.CFG_TC_VC1437, cc: CEPL.CFG_CC_OPT, arch: CEPL.CFG_ARCH_X86_64, houdini: '20.0', cesdk: PAPL.Dependencies.CESDK_LATEST ],
 ]
 
 
@@ -89,9 +90,9 @@ Map taskGenTest() {
 
 Map taskGenBuild() {
     Map tasks = [:]
-	tasks << cepl.generateTasks('pld-hdn18.5', this.&taskBuildPalladio, CONFIGS_HOUDINI_185)
 	tasks << cepl.generateTasks('pld-hdn19.0', this.&taskBuildPalladio, CONFIGS_HOUDINI_190)
 	tasks << cepl.generateTasks('pld-hdn19.5', this.&taskBuildPalladio, CONFIGS_HOUDINI_195)
+	tasks << cepl.generateTasks('pld-hdn20.0', this.&taskBuildPalladio, CONFIGS_HOUDINI_200)
 	return tasks;
 }
 
@@ -107,9 +108,7 @@ def taskSourceCheckout(cfg) {
 def taskRunTest(cfg) {
 	cepl.cleanCurrentDir()
 	unstash(name: SOURCE_STASH)
-	dir(path: 'build') {
-		papl.runCMakeBuild(SOURCE, 'build_and_run_tests', cfg, [])
-	}
+	buildPalladio(cfg, [], 'build_and_run_tests')
 	junit('build/test/palladio_test_report.xml')
 }
 
@@ -122,8 +121,9 @@ def taskBuildPalladio(cfg) {
 		[ key: 'PLD_VERSION_BUILD',   val: env.BUILD_NUMBER ],
 		[ key: 'PLD_HOUDINI_VERSION', val: cfg.houdini]
 	]
-	dir(path: 'build') {
-		final String stdOut = papl.runCMakeBuild(SOURCE, BUILD_TARGET, cfg, defs)
+
+	final String stdOut = buildPalladio(cfg, defs, BUILD_TARGET)
+	if(!papl.runsOnDocker(cfg)) {
 		scanAndPublishBuildIssues(cfg, stdOut)
 	}
 
@@ -138,6 +138,35 @@ def taskBuildPalladio(cfg) {
 	papl.publish('palladio', env.BRANCH_NAME, "palladio-*", versionExtractor, cfg, classifierExtractor)
 }
 
+def buildPalladio(cfg, defs, target) {
+	if(cfg.os == CEPL.CFG_OS_RHEL8) {
+		Map dirMap = [ "${env.WORKSPACE}" : cfg.containerWorkspace ]
+		Map envMap = [ DEFAULT_UID: '$(id -u)', DEFAULT_GID: '$(id -g)', WORKSPACE: cfg.containerWorkspace ]
+		String src = "${cfg.containerWorkspace}/${SOURCE}";
+		String bld = "${cfg.containerWorkspace}/build";
+
+		cmd = "cd ${src}"
+		cmd += "\npython3 -m ensurepip"
+		cmd += "\npython3 -m pip install --user pipenv"
+		cmd += "\npython3 -m pipenv install"
+		cmd += "\nPYVENV=\$(python3 -m pipenv --venv)"
+		cmd += "\ncd ${cfg.containerWorkspace}"
+		cmd += "\nsource \${PYVENV}/bin/activate"
+		cmd += "\nconan remote add --force --insert=0 zrh-conan ${psl.CONAN_REMOTE_URL}"
+
+		cmd += "\ncmake -G Ninja -DCMAKE_BUILD_TYPE=Release "
+		defs.each { d -> cmd += " -D${d.key}=${ (d.val instanceof Closure) ? d.val.call(cfg) : d.val }" }
+		cmd +=" -S ${src} -B ${bld}"
+
+		cmd += "\ncmake --build ${bld} --target ${target}"
+		String stdOut = psl.runDockerCmd(cfg.containerId, cfg.containerWorkspace, cmd, dirMap, envMap)
+		echo(stdOut)
+		return stdOut
+	} else {
+		return papl.runCMakeBuild(SOURCE, 'build', target, cfg, defs)
+	}
+}
+
 def scanAndPublishBuildIssues(Map cfg, String consoleOut) {
 	final String houdiniSuf = cfg.houdini.replace('.', '_')
 	final String buildSuf = "${cepl.prtBuildSuffix(cfg)}-${houdiniSuf}"

README.md

@@ -48,7 +48,7 @@ Please refer to the [release notes](#release-notes) for the supported CityEngine
 
 - Windows 10 or 11 (64bit)
 - RedHat Enterprise Linux 8 or 9 and compatible (CentOS, Alma Linux, Rocky Linux, ...)
-- Houdini 18.5, 19.0 or 19.5
+- Houdini 19.0, 19.5 or 20.0
 - See [release notes](#release-notes) for compatible CityEngine versions and requirements for commercial work. 
 
 #### From Pre-Built Binaries
@@ -268,12 +268,12 @@ It can be useful to put RPKs into an `rpk` sub-directory of your current Houdini
 
 - [cmake 3.13 or later](https://cmake.org/download)
 - [conan 1.20 or later](https://www.conan.io/downloads)
-- Linux: GCC 9.3 or later
-- Windows: Visual Studio 2019 (MSVC 14.27) or later
+- Linux: GCC 11.2 or later
+- Windows: Visual Studio 2022 (MSVC 14.37) or later
 
 ### Required Build Dependencies (Latest Release)
 
-- Installation of Houdini 18.5, 19.0 or 19.5 (see https://sidefx.com/download)
+- Installation of Houdini 19.0, 19.5 or 20.0 (see https://sidefx.com/download)
 
 The following will be automatically fetched via the bootstrap steps below:
 
@@ -282,7 +282,7 @@ The following will be automatically fetched via the bootstrap steps below:
 
 ### Build Instructions
 
-Default is Houdini 19.5. See below how to build for different Houdini versions.
+Default is Houdini 20.0. See below how to build for different Houdini versions.
 
 #### Bootstrap
 
@@ -291,35 +291,35 @@ The below steps will populate your local Conan repository with dependencies for
 ##### Linux
 
 1. Checkout Palladio: `git clone [email protected]:esri/palladio.git && cd palladio`
-1. Download CityEngine SDK: `conan create -pr conan/profiles/linux-gcc93 conan/cesdk cesdk/3.0.8905@esri-rd-zurich/stable`
-1. Extract and package the HDK from your local Houdini 19.5 installation (adjust Z to your Houdini version): `conan create -pr conan/profiles/linux-gcc93 conan/houdini houdini/19.5.Z@sidefx/stable` (Note: use the option `-e HOUDINI_INSTALL=/path/to/your/hfs19.5.Z`, if Houdini is not installed at the standard location, e.g. at `/opt/hfs19.5.Z` for Linux).
+1. Download CityEngine SDK: `conan create -pr conan/profiles/linux-gcc112 conan/cesdk cesdk/3.2.10211@esri-rd-zurich/stable`
+1. Extract and package the HDK from your local Houdini 20.0 installation (adjust Z to your Houdini version): `conan create -pr conan/profiles/linux-gcc112 conan/houdini houdini/20.0.Z@sidefx/stable` (Note: use the option `-e HOUDINI_INSTALL=/path/to/your/hfs20.0.Z`, if Houdini is not installed at the standard location, e.g. at `/opt/hfs20.0.Z` for Linux).
 
 ##### Windows
 
 1. Checkout Palladio: `git clone [email protected]:esri/palladio.git`
 1. Open a Windows command shell and `cd` to the Palladio git repository
-1. Download CityEngine SDK: `conan create -pr conan/profiles/windows-v142 conan/cesdk cesdk/3.0.8905@esri-rd-zurich/stable`
-1. Extract and package the HDK from your local Houdini installation (adjust Z to your Houdini version): `conan create -pr conan/profiles/windows-v142 conan/houdini houdini/19.5.Z@sidefx/stable` (Note: use the option `-e HOUDINI_INSTALL=C:/path/to/your/houdini/installation`, if Houdini is not installed at the standard location for Windows).
+1. Download CityEngine SDK: `conan create -pr conan/profiles/windows-v143 conan/cesdk cesdk/3.2.10211@esri-rd-zurich/stable`
+1. Extract and package the HDK from your local Houdini installation (adjust Z to your Houdini version): `conan create -pr conan/profiles/windows-v143 conan/houdini houdini/20.0.Z@sidefx/stable` (Note: use the option `-e HOUDINI_INSTALL=C:/path/to/your/houdini/installation`, if Houdini is not installed at the standard location for Windows).
 
 #### Building Palladio
 
 Note: to build for another Houdini version, add the cmake argument `-DPLD_HOUDINI_VERSION=X.Y`.
 
 ##### Linux
 
-1. Ensure GCC 9.3 is active.
+1. Ensure GCC 11.2 is active.
 1. `cd` into your Palladio git repository
 1. `mkdir -p build/release && cd build/release`
 1. `cmake -DCMAKE_BUILD_TYPE=Release ../../src`
-1. `make install` (the plugin will be installed into your `~/houdini19.5/dso` directory)
+1. `make install` (the plugin will be installed into your `~/houdini20.0/dso` directory)
 
 ##### Windows
 
-1. Open a MSVC 14.27 x64 shell (Visual Studio 2019) and `cd` to the Palladio git repository
+1. Open a MSVC 14.37 x64 shell (Visual Studio 2022) and `cd` to the Palladio git repository
 1. `mkdir build/release`
 1. `cd build/release`
 1. `cmake -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release ../../src`
-1. `nmake install` (the plugin will be installed into your `%USERPROFILE%/Documents/houdini19.5/dso` directory)
+1. `nmake install` (the plugin will be installed into your `%USERPROFILE%/Documents/houdini20.0/dso` directory)
 
 #### Debugging Palladio
 
@@ -334,7 +334,7 @@ See [Quick Start](#quick-start) how to launch Houdini with Palladio.
 
 #### Linux
 
-1. Ensure GCC 9.3 is active.
+1. Ensure GCC 11.2 is active.
 1. `cd` into your Palladio git repository
 1. `mkdir -p build/relTest && cd build/relTest`
 1. `cmake -DCMAKE_BUILD_TYPE=Release -DPLD_TEST=1 ../../src`
@@ -343,7 +343,7 @@ See [Quick Start](#quick-start) how to launch Houdini with Palladio.
 
 #### Windows
 
-1. Open a MSVC 14.27 x64 shell (Visual Studio 2019) and `cd` to the Palladio git repository
+1. Open a MSVC 14.37 x64 shell (Visual Studio 2022) and `cd` to the Palladio git repository
 1. `mkdir build/relTest`
 1. `cd build/relTest`
 1. `cmake -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DPLD_TEST=1 ../../src`
@@ -352,6 +352,20 @@ See [Quick Start](#quick-start) how to launch Houdini with Palladio.
 
 ## Release Notes
 
+### v2.1.0 (Nov 1, 2024)
+
+- Compatible CityEngine versions: 2024.0 or older
+- For commercial work, a [license](https://www.esri.com/cityengine) for CityEngine 2022.0 or later is required.
+
+#### Added:
+- Support for Houdini 20.0
+
+#### Removed:
+- Support for Houdini 18.5
+
+#### Changed:
+- Updated Procedural Runtime (PRT) to 3.2.10211 (corresponds to CityEngine 2024.0)
+
 ### v2.0.0 (Jul 1, 2023)
 
 - Compatible CityEngine versions: 2023.0 or older

conan/cesdk/conanfile.py

@@ -12,19 +12,26 @@ class CESDKConan(ConanFile):
 
     def build(self):
         if self.settings.os == "Windows":
-            if self.version >= Version("2.4.7316"):
+            if self.version >= Version("3.2.9903"):
+                toolchain = "vc1437"
+            elif self.version >= Version("2.4.7316"):
                 toolchain = "vc1427"
             elif self.version >= Version("2.2.6332"):
                 toolchain = "vc142"
             else:
                 toolchain = "vc141"
             url = self.baseURL.format(self.version, self.version, "win10", toolchain)
         elif self.settings.os == "Linux":
-            if self.version >= Version("2.4.7316"):
+            if self.version >= Version("3.2.9903"):
+                gccVersion = "gcc112"
+                rhel = "rhel8"
+            elif self.version >= Version("2.4.7316"):
                 gccVersion = "gcc93"
+                rhel = "rhel7"
             else:
                 gccVersion = "gcc63"
-            url = self.baseURL.format(self.version, self.version, "rhel7", gccVersion)
+                rhel = "rhel7"
+            url = self.baseURL.format(self.version, self.version, rhel, gccVersion)
         else:
             raise Exception("Unsupported configuration")
         tools.get(url, verify=False)

conan/profiles/linux-gcc112

@@ -0,0 +1,15 @@
+[settings]
+os=Linux
+os_build=Linux
+arch=x86_64
+arch_build=x86_64
+build_type=Release
+compiler=gcc
+compiler.version=11
+compiler.libcxx=libstdc++
+
+[options]
+
+[build_requires]
+
+[env]

conan/profiles/windows-v143

@@ -0,0 +1,15 @@
+[settings]
+os=Windows
+os_build=Windows
+arch=x86_64
+arch_build=x86_64
+build_type=Release
+compiler=Visual Studio
+compiler.version=17
+compiler.runtime=MD
+
+[options]
+
+[build_requires]
+
+[env]

src/CMakeLists.txt

@@ -21,9 +21,9 @@ set(HOUDINI_RELATIVE_PALLADIO_PATH "${HOUDINI_RELATIVE_PACKAGES_PATH}/palladio")
 ### versioning
 
 set(PLD_VERSION_MAJOR 2)
-set(PLD_VERSION_MINOR 0)
+set(PLD_VERSION_MINOR 1)
 set(PLD_VERSION_PATCH 0)
-
+# set(PLD_VERSION_PRE "-dev.0") # set to empty string for final releases
 if (NOT PLD_VERSION_BUILD)
     set(PLD_VERSION_BUILD DEV)
 endif ()

src/cmake/common.cmake

@@ -68,7 +68,6 @@ function(pld_set_prtx_compiler_flags TGT)
     if (PLD_WINDOWS)
         target_compile_options(${TGT} PRIVATE -bigobj -GR -EHsc $<IF:$<CONFIG:Debug>,-MDd,-MD>)
     elseif (PLD_LINUX)
-        target_compile_options(${TGT} PRIVATE -march=nocona -D_GLIBCXX_USE_CXX11_ABI=0)
         target_link_options(${TGT} PRIVATE "LINKER:SHELL:--exclude-libs ALL")
     endif ()
 endfunction()

src/cmake/dependencies.cmake

@@ -8,28 +8,27 @@ conan_check(VERSION 1.20 REQUIRED)
 ### select Houdini version and required toolchain
 
 if (NOT PLD_HOUDINI_VERSION)
-	set(PLD_HOUDINI_VERSION "19.5") # use Houdini 19.5 by default
+	set(PLD_HOUDINI_VERSION "20.0") # use Houdini 20.0 by default
 endif()
 
 string(REPLACE "." ";" PLD_HDN_VER "${PLD_HOUDINI_VERSION}")
 list(GET PLD_HDN_VER 0 PLD_HDN_VER_MAJ)
 list(GET PLD_HDN_VER 1 PLD_HDN_VER_MIN)
 
+# Houdini 20.0
+if (${PLD_HDN_VER_MAJ} STREQUAL "20" AND ${PLD_HDN_VER_MIN} STREQUAL "0")
+	message(STATUS "Asking Conan for Houdini 20.0...")
+	set(PLD_CONANFILE "conanfile-h200.py")
+
 # Houdini 19.5
-if (${PLD_HDN_VER_MAJ} STREQUAL "19" AND ${PLD_HDN_VER_MIN} STREQUAL "5")
+elseif (${PLD_HDN_VER_MAJ} STREQUAL "19" AND ${PLD_HDN_VER_MIN} STREQUAL "5")
 	message(STATUS "Asking Conan for Houdini 19.5...")
 	set(PLD_CONANFILE "conanfile-h195.py")
 
 # Houdini 19.0
 elseif (${PLD_HDN_VER_MAJ} STREQUAL "19" AND ${PLD_HDN_VER_MIN} STREQUAL "0")
 	message(STATUS "Asking Conan for Houdini 19.0...")
 	set(PLD_CONANFILE "conanfile-h190.py")
-
-# Houdini 18.5
-elseif (${PLD_HDN_VER_MAJ} STREQUAL "18" AND ${PLD_HDN_VER_MIN} STREQUAL "5")
-	message(STATUS "Asking Conan for Houdini 18.5...")
-	set(PLD_CONANFILE "conanfile-h185.py")
-
 endif()
 
 
@@ -45,9 +44,9 @@ endif()
 ### run conan
 
 if(PLD_WINDOWS)
-	set(PLD_CONAN_PROFILE "${PLD_CONAN_TOOLS}/profiles/windows-v142")
+	set(PLD_CONAN_PROFILE "${PLD_CONAN_TOOLS}/profiles/windows-v143")
 elseif(PLD_LINUX)
-	set(PLD_CONAN_PROFILE "${PLD_CONAN_TOOLS}/profiles/linux-gcc93")
+	set(PLD_CONAN_PROFILE "${PLD_CONAN_TOOLS}/profiles/linux-gcc112")
 endif()
 
 if (PLD_GEN_VISUAL_STUDIO AND NOT CMAKE_BUILD_TYPE)

src/conanfile-h190.py

@@ -18,5 +18,5 @@ def requirements(self):
             if "PLD_CONAN_CESDK_VERSION" in os.environ:
                 cesdk_version = os.environ["PLD_CONAN_CESDK_VERSION"]
             else:
-                cesdk_version = "3.0.8905"
+                cesdk_version = "3.2.10211"
             self.requires("cesdk/{}@esri-rd-zurich/stable".format(cesdk_version))

src/conanfile-h195.py

@@ -18,5 +18,5 @@ def requirements(self):
             if "PLD_CONAN_CESDK_VERSION" in os.environ:
                 cesdk_version = os.environ["PLD_CONAN_CESDK_VERSION"]
             else:
-                cesdk_version = "3.0.8905"
+                cesdk_version = "3.2.10211"
             self.requires("cesdk/{}@esri-rd-zurich/stable".format(cesdk_version))