p71924506
/
carla
mirror of https://github.com/carla-simulator/carla.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor changes in build system

This commit is contained in:
nsubiron 2017-03-31 16:42:30 +01:00
parent 05a39a37f1
commit ebb5708bfc
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Carla/Carla.Build.cs
View File

@ -5,6 +5,8 @@ using UnrealBuildTool;
public class Carla : ModuleRules
{
// Apparently, Unreal uses the Release C++ Runtime (CRT) even in debug mode,
// so unless we recompile the engine we cannot link the debug libraries.
private readonly bool bUseDebugLibs = false;
public Carla(TargetInfo Target)
@ -138,7 +140,7 @@ public class Carla : ModuleRules
private void AddCarlaServerDependency(TargetInfo Target)
{
string CarlaServerIncludePath = "CarlaServer/include";
string CarlaServerIncludePath = Path.Combine(ModuleDirectory, "..", "CarlaServer/include");
string CarlaServerLibPath = Path.Combine(ModuleDirectory, "..", "CarlaServer/lib");
string CarlaServerLibBaseName;

16
Source/CarlaServer/CMakeLists.txt
View File

@ -1,15 +1,21 @@
cmake_minimum_required (VERSION 3.0.2)
project (CarlaServer)
if (UNIX)
set(CMAKE_CXX_COMPILER clang++)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
find_package(Threads)
endif (UNIX)
# ==============================================================================
# -- Compiler config -----------------------------------------------------------
# ==============================================================================
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD_REQUIRED 14)
if (UNIX)
set(CMAKE_CXX_COMPILER clang++)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -std=c++14")
find_package(Threads)
endif (UNIX)
# ==============================================================================
# -- Suppress windows warning --------------------------------------------------
# ==============================================================================