From 088fd8b0842d069a85c44d52433c25136c3f1ca8 Mon Sep 17 00:00:00 2001 From: Joseph Schornak Date: Wed, 26 Feb 2020 13:13:22 -0600 Subject: [PATCH] Disable AVX as workaround for Eigen alignment issue, default to C++14 --- CMakeLists.txt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fdb9ec5..f72c11d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,7 +25,8 @@ add_library(${PROJECT_NAME} SHARED src/${PROJECT_NAME}/renderable_mesh.cpp src/${PROJECT_NAME}/shader_program.cpp src/${PROJECT_NAME}/glfw_guard.cpp) -target_compile_options(${PROJECT_NAME} PRIVATE -std=c++11) +target_compile_options(${PROJECT_NAME} PRIVATE -std=c++14) +target_compile_options(${PROJECT_NAME} PUBLIC -mno-avx) target_include_directories(${PROJECT_NAME} PUBLIC "$" "$") @@ -42,7 +43,7 @@ target_link_libraries(${PROJECT_NAME} PUBLIC add_library(${PROJECT_NAME}_interfaces SHARED src/interfaces/pcl_interface.cpp src/interfaces/opencv_interface.cpp) -target_compile_options(${PROJECT_NAME}_interfaces PRIVATE -std=c++11) +target_compile_options(${PROJECT_NAME}_interfaces PRIVATE -std=c++14) target_include_directories(${PROJECT_NAME} PUBLIC "$" "$") @@ -56,7 +57,7 @@ target_link_libraries(${PROJECT_NAME}_interfaces PUBLIC # Example showing basic usage add_executable(${PROJECT_NAME}_test src/usage_example.cpp) -target_compile_options(${PROJECT_NAME}_test PRIVATE -std=c++11) +target_compile_options(${PROJECT_NAME}_test PRIVATE -std=c++14) set_target_properties(${PROJECT_NAME}_test PROPERTIES OUTPUT_NAME depth_example PREFIX "") target_include_directories(${PROJECT_NAME}_test PUBLIC "$" @@ -67,7 +68,7 @@ target_link_libraries(${PROJECT_NAME}_test PUBLIC # Example showing an orbiting camera add_executable(${PROJECT_NAME}_orbit src/camera_orbit_example.cpp) -target_compile_options(${PROJECT_NAME}_orbit PRIVATE -std=c++11) +target_compile_options(${PROJECT_NAME}_orbit PRIVATE -std=c++14) set_target_properties(${PROJECT_NAME}_orbit PROPERTIES OUTPUT_NAME orbit_example PREFIX "") target_include_directories(${PROJECT_NAME}_orbit PUBLIC "$"