Commit a945b9cd authored by Emmanuel Promayon's avatar Emmanuel Promayon
Browse files

FIXED CXX bugs should be added not replaced



(forwarded from debian packaging patch)
Signed-off-by: Emmanuel Promayon's avatarEmmanuel Promayon <Emmanuel.Promayon@imag.fr>
parent 90593fe0
...@@ -31,7 +31,7 @@ include(camitk/packaging/CamiTKOpenSourcePackaging) ...@@ -31,7 +31,7 @@ include(camitk/packaging/CamiTKOpenSourcePackaging)
camitk_opensource_packaging() camitk_opensource_packaging()
# CamiTK 4.0 is C++11 compliant # CamiTK 4.0 is C++11 compliant
set(CMAKE_CXX_FLAGS "-std=c++11") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
# Specific to SDK: first compile the SDK (it looks like a CEP but is sooooo special...) # Specific to SDK: first compile the SDK (it looks like a CEP but is sooooo special...)
add_subdirectory(sdk) add_subdirectory(sdk)
......
if (WIN32) if (WIN32)
if(CMAKE_CL_64) if(CMAKE_CL_64)
# for 64 bits platform, enable big obj (.o) handling, in ordere to correctly compile this (heavy) project # for 64 bits platform, enable big obj (.o) handling, in order to correctly compile this (heavy) project
if (MSVC) if (MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}/bigobj") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")
elseif(MINGW) elseif(MINGW)
set(CMAKE_CXX_FLAGS "-O3 -finline-functions") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -finline-functions")
endif() endif()
endif() endif()
endif() endif()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment