From 76598268fcd9586fe4838d22c580d40080dc9a84 Mon Sep 17 00:00:00 2001
From: Tristan Walter <twalter@orn.mpg.de>
Date: Tue, 13 Oct 2020 01:15:46 +0200
Subject: [PATCH] fewer cxx flags
---
Application/CMakeLists.txt | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/Application/CMakeLists.txt b/Application/CMakeLists.txt
index 5424242..6b95cc9 100644
--- a/Application/CMakeLists.txt
+++ b/Application/CMakeLists.txt
@@ -56,6 +56,7 @@ if(TREX_CONDA_PACKAGE_INSTALL)
endif()
set(CMAKE_DEBUG_POSTFIX -d)
+set(ORIGINAL_CXX_FLAGS ${CMAKE_CXX_FLAGS})
if(WIN32)
set(BUILD_SHARED_LIBS OFF)
@@ -741,11 +742,11 @@ if(${TREX_BUILD_OPENCV})
"-DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE}"
"-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=${CMAKE_CXX_FLAGS_RELWITHDEBINFO}"
"-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}"
- "-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}"
+ "-DCMAKE_CXX_FLAGS=${ORIGINAL_CXX_FLAGS}"
"-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}")
if(APPLE AND CMAKE_COMPILER_IS_GNUCXX)
- set(${OPENCV_EXTRA_FLAGS_} "-DWITH_AVFOUNDATION=OFF" "-DCMAKE_FIND_ROOT_PATH ${CMAKE_FIND_ROOT_PATH}")
+ set(${OPENCV_EXTRA_FLAGS_} "-DWITH_AVFOUNDATION=OFF" "-DCMAKE_FIND_ROOT_PATH=${CMAKE_FIND_ROOT_PATH}")
endif()
if(APPLE)
@@ -784,15 +785,17 @@ if(${TREX_BUILD_OPENCV})
)
endif()
endif()
- set(OPENCV_CMAKE_ARGS "")
if(TREX_CONDA_PACKAGE_INSTALL)
set(TREX_CMAKE_BUILD_TYPE Release)
else()
set(TREX_CMAKE_BUILD_TYPE $<$<CONFIG:Debug>:Release>$<$<CONFIG:Release>:Debug>)
endif()
+
message(STATUS "TREX_CMAKE_BUILD_TYPE ${TREX_CMAKE_BUILD_TYPE}")
- set(OPENCV_CMAKE_ARGS ${OPENCV_CMAKE_ARGS}
+
+ set(OPENCV_CMAKE_ARGS
+ ${OPENCV_EXTRA_FLAGS_}
-DCMAKE_BUILD_TYPE=${TREX_CMAKE_BUILD_TYPE}
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
@@ -832,8 +835,7 @@ if(${TREX_BUILD_OPENCV})
-DWITH_OPENEXR=OFF
-DCMAKE_PREFIX_PATH:PATH=${OPENCV_PREFIX_PATH}
-DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_CURRENT_BINARY_DIR}/opencv_install
- -DCMAKE_DEBUG_POSTFIX=
- ${OPENCV_EXTRA_FLAGS_})
+ -DCMAKE_DEBUG_POSTFIX=)
message(STATUS "OPENCV_EXTRA_FLAGS_ = ${OPENCV_EXTRA_FLAGS_}")
if(UNIX)
--
GitLab