Commit Graph

61 Commits

Author SHA1 Message Date
MarcelPiNacy-CVC 0bbd239b1a
CMake refactor (#8168)
* Add option VERBOSE_CONFIGURE + several other minor tweaks.

* Minor refactor and expose version option variables for ROS2 build.

* Remove unneeded option BUILD_PYTHON_API_WHEEL_PACKAGE.

* Make cmake_minimum_required uniform + fix potential linker error.

* Revert ROS2 configure.
2024-09-19 17:35:18 +02:00
MarcelPiNacy-CVC 908c203fca
Enable clangd support. (#8104)
* Enable clangd support.

* Disable CMAKE_EXPORT_COMPILE_COMMANDS by default.

* Revert unwanted target rename.
2024-09-03 13:19:20 +02:00
Blyron e9fdf846d0
Update uproject, update project version (#7891)
* Update uproject, update project version

* Re enable performance monitor
2024-07-01 15:07:23 +02:00
Xavier Solé Nogués 2bbe3c5e8b
Remove boost from ROS2 (#7670) 2024-05-17 11:37:04 +02:00
MarcelPiNacy-CVC 9f4c8422a8
Add functions and macros to aid in documentation and general usability. (#7639)
* Introduce the macros carla_add_executable, carla_add_library, carla_add_custom_target and introduce help dialog and help file generation.

* Remove semicolon on output.

* Switch from using configure time logic to a target "carla-help".

* Remove GCC_COMPILER option.

* Check PACKAGE_CONFIGURATION for empty.

* Revert to add_library for carla-ros2-native ExternalProject.

* Add function carla_add_target_docs and document "clean".

* Minor fix (missing names).

---------

Co-authored-by: Marcel Pi <25649656+MarcelPiNacy@users.noreply.github.com>
Co-authored-by: Marcel Pi <marcelpi97@gmail.com>
2024-05-15 17:50:06 +02:00
Xavier Solé Nogués 08c06a01df
Revert "Introduce several helper macros and utilities for improved usability.…" (#7635)
This reverts commit 321082ed0b.

Co-authored-by: Marcel Pi <marcelpi97@gmail.com>
2024-05-13 11:45:53 +02:00
MarcelPiNacy-CVC 321082ed0b
Introduce several helper macros and utilities for improved usability. (#7609)
* Introduce the macros carla_add_executable, carla_add_library, carla_add_custom_target and introduce help dialog and help file generation.

* Remove semicolon on output.

* Switch from using configure time logic to a target "carla-help".

* Remove GCC_COMPILER option.

* Check PACKAGE_CONFIGURATION for empty.

---------

Co-authored-by: Marcel Pi <25649656+MarcelPiNacy@users.noreply.github.com>
Co-authored-by: Marcel Pi <marcelpi97@gmail.com>
2024-05-13 09:47:15 +02:00
Marcel Pi 4212ff6701
Add wheel package generation. (#7334)
* Python package progress

* Remove unneeded POST_BUILD command.

* Switch to scikit-build-core (WIP)

* More changes boost::python-related changes.

* Add LICENSE copy, remove explicit reference to C/C++ compiler.

* Switch back to pure CMake build, using package data to include C++ extension binaries.

* Minor changes.

* Add fallback if PEP517 is unavailable.

* Integrate PythonAPI target in main build.

* Fix minor build order issue.

* Remove invalid option in setup.py.

* Address review comments.

* Switch finally to scikit-build-core for PythonAPI build/wheel and refactor CMake folder.

* Minor fix.

* Update gitignore.

* Minor change.

* Remove unused CarlaOptions include

* Add missing file copy.

* Add several Ubuntu-related changes.

* Update requirements.txt

Co-authored-by: Xavier Solé Nogués <xavisolesoft@gmail.com>

* Update CMake/Common.cmake

Co-authored-by: Xavier Solé Nogués <xavisolesoft@gmail.com>

---------

Co-authored-by: xavisolesoft <xavisolesoft@gmail.com>
2024-04-09 16:32:09 +02:00
Marcel Pi 6150720de2
Cmake add package target (#7289)
Add package target

---------

Co-authored-by: Xavier Solé Nogués <xavisolesoft@gmail.com>
2024-04-02 11:05:55 +01:00
Xavier Solé Nogués 4b3f5047f3
Setup.bat: Install requirements (#7281)
* Install requirements

* Parcial implementation

* Cloning content

* Mkdir Content

* Fix path bras.

* Launch Visual sutdio

* Print log and

* Fix crash when opening Visual Studio command line

* Fix echo " characters

* Setup create COntent folder just if was not previously created

* Fix .bat calls

* Implement Engine build command

* Install python and fix Engine path environment variable

* Retrys

* Add crash on error behaviour to commands

* Adding some corner case checks about already installed components and message text corrections

* Fix set CARLA_UNREAL_ENGINE_PATH

* Fix Python installation and

* Fix python and Unreal Engine paths

* Remove not working retry code

* Clean extra spaces

* Upgrade pip install

* Integration fixes

* Fix Carla Compilation environment and python path

* Fix CARLA build: Setup paths
2024-04-02 10:20:46 +02:00
Marcel Pi 9bc6e1cce1
Add check for CarlaUnreal Content presence. (#7294)
* Add check for CarlaUnreal Content presence. Remove check for Release build and instead guard against Debug build.

---------

Co-authored-by: Xavier Solé Nogués <xavisolesoft@gmail.com>
2024-03-26 13:55:35 +00:00
Marcel Pi d07a623c9c
Fix additional issues with escape characters in carla_string_option. (#7293)
* Fix string option escape character errors.

* Additional string option escape character fixes.

* Minor formatting change.

* More fixes.

* Revert back to file copy for *.def.

* Fix build order issue related to carla-unreal-configure.

* Update CMakeLists.txt

* Update CMakeLists.txt

* Switch to using file(GENERATE ...)
2024-03-25 17:23:16 +01:00
Marcel Pi 57223e7387 Fix incorrect dependency order when generating UE project files + other minor fixes. 2024-03-20 11:34:44 +01:00
Marcel Pi 1621521610 Add CppClient example to CMake build. 2024-03-18 20:20:02 +01:00
Marcel Pi 3206014587 Fix missing cmake_error definition. 2024-03-18 14:09:38 +01:00
Marcel Pi 36a29194bb Several build order fixes, switch from boost "exclude" projects to "include". 2024-03-17 11:46:19 +01:00
Marcel Pi 44d0c1bc3c
Marcel/5.3/cmake libcarla image support list (#7249)
* Reintroduce launch-only target.

* Expose explicit mechanism to request image support to libcarla.

* Update CMake/Options/Common.cmake

Co-authored-by: Xavier Solé Nogués <xavisolesoft@gmail.com>

* Remove unwanted changes.

* Add missing EOF newline.

---------

Co-authored-by: Xavier Solé Nogués <xavisolesoft@gmail.com>
2024-03-14 19:11:15 +01:00
Xavier Solé Nogués 979b942ff5
Implement Cmake ros2 native external project (#7252)
* libcarla-ros2-native.so build and install working.

* Fixes and add Carla.Build.cs

* ROS2Native build system implemented for CMake

* Add g++/gcc option and remove Build path reference from Carla.build.cs

* Auto add ros2 target when ros2 and server is enabled

* Remove ROS2 from client

* Fix build when ROS2 is disabled.

* Clean up space

* Fix will error with ROS2 enabled

* Remove macro collision ROS2
2024-03-14 15:27:10 +00:00
Marcel Pi 6d058e9a89 Temporarily remove references to cmake_message. 2024-03-14 12:08:43 +01:00
Marcel Pi 3f85bde1ab Improve build logging. 2024-03-13 15:38:31 +01:00
Marcel Pi 0a9437fd10 Improve warning suppression. 2024-03-13 01:04:27 +01:00
Marcel Pi 07963dba96 Make _CRT_SECURE_NO_WARNINGS a global definition. Introduce mechanism to disable warnings. 2024-03-12 23:19:57 +01:00
Marcel Pi 8c14d9ff4c Minor changes, introduce options for -Wall and -Werror. 2024-03-12 13:04:01 +01:00
Marcel Pi 113f9d4bf2 Check dependencies when configuring UE. 2024-03-12 11:20:17 +01:00
Marcel Pi 0b15f68d1b Rename BUILD_CARLA_UE to BUILD_CARLA_UNREAL and add USES_TERMINAL to UE5 custom targets. 2024-03-10 21:42:58 +01:00
Marcel Pi 5966d00496 Merge branch 'marcel/ue5/rename' into ue5-dev 2024-03-08 20:31:48 +01:00
Marcel Pi 01852e6a6e - Update gitignore.
- Add launch and launch-only CMake custom targets.
- Temporary workaround for lack of a properly parameterized toolchain file.
- Change all references to CarlaUE4 to CarlaUnreal.
- Separate CMake Options files.
2024-03-08 20:31:22 +01:00
Marcel Pi ccb5d98d26 Add Linux Toolchain file. 2024-03-07 17:11:15 +01:00
Marcel Pi d72dd89db4 More Ubuntu build progress... 2024-03-06 17:20:13 +01:00
Marcel Pi e5aa1463f7 Check potentially missing policy. 2024-03-04 17:52:54 +01:00
MarcelPiNacy d0dce22ba1 Replace references to CarlaUE4. 2024-03-04 13:33:51 +01:00
MarcelPiNacy a4c0abbda1 Temporary fix for Ubuntu CMake dependencies. Isolate ROS2 code in CarlaUE. 2024-03-04 13:10:00 +01:00
Marcel Pi 3856c97f15 PythonAPI fixes, rework PixelReader. 2024-02-28 15:56:26 +01:00
Marcel Pi 74d19eece2 Restructure PythonAPI folder layout + update copyright. 2024-02-26 17:09:02 +01:00
Marcel Pi 04e7f3ebdb Remove unused policy spec. 2024-02-22 18:22:40 +01:00
Marcel Pi 7b4e895ae6 Remove reference to find_carla.py.in 2024-02-22 17:39:48 +01:00
Marcel Pi b423fe06e2 Fix CMake PythonAPI build. Disable OSM2ODR and OSM World Renderer. 2024-02-20 16:34:31 +01:00
Marcel Pi aeaa621e3a More progress with pure CMake migration. 2024-02-06 21:47:29 +01:00
Marcel Pi 9179489b96 More progress... 2024-02-05 11:52:25 +01:00
Marcel Pi 7e7d3c5eb9 Misc changes. 2024-02-01 00:46:04 +01:00
Marcel Pi 9b5d26c3b5 Overhaul PythonAPI, switch to scikit-build-core. 2024-01-25 16:24:20 +01:00
Marcel Pi a6e32afbe1 Fix RTTI error. 2024-01-24 09:45:50 +01:00
Marcel Pi aa24005f88 Several fixes (PythonAPI, Configure, Boost Exceptions). 2024-01-23 12:41:57 +01:00
Marcel Pi 35c25e768d More fixes. 2023-12-27 19:43:25 +01:00
Marcel Pi 116fa1afe3 Misc fixes and improvements. 2023-12-01 15:21:12 +01:00
Marcel Pi c869a55b0b Move from boost optional, variant, shared_ptr, filesystem to STL. Update copyright notices. 2023-11-27 20:34:03 +01:00
Marcel Pi 06a2c0467f Disable Houdini and fix several issues related to Proj and PhysX. 2023-11-27 17:41:52 +01:00
Marcel Pi fb2d231c75 General progress and fixes, Houdini does not work however. 2023-11-25 18:51:58 +01:00
Marcel Pi 7b68258a3f Fix CMakeLists and multigpu errors, upgraded to C++17 and added support for clangd. There are recast&detour errors though. 2023-11-24 17:51:51 +01:00
Marcel Pi fb3d37fc50 UE-side build system progress + disable PhysX preemtively. 2023-11-24 17:35:38 +01:00