From e77513267df9e82b129e91617bed943d5e1a4b0f Mon Sep 17 00:00:00 2001
From: Tristan Walter <twalter@orn.mpg.de>
Date: Mon, 12 Oct 2020 22:53:31 +0200
Subject: [PATCH] trying different optimization options
---
.gitignore | 1 +
Application/CMakeLists.txt | 17 ++++++++++++-----
Application/default.settings | 1 +
3 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/.gitignore b/.gitignore
index 259148f..1905f77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,4 @@
*.exe
*.out
*.app
+Application/build/
diff --git a/Application/CMakeLists.txt b/Application/CMakeLists.txt
index 8edc6cd..23f5893 100644
--- a/Application/CMakeLists.txt
+++ b/Application/CMakeLists.txt
@@ -70,9 +70,9 @@ if(WIN32)
#endif()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_USE_MATH_DEFINES -DNOMINMAX -DWIN32_LEAN_AND_MEAN -DCURL_STATICLIB")
#set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB:MSVCRT")
- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT /bigobj")
- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd /bigobj")
- set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /MT /bigobj")
+ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT /bigobj /O2 /GL")
+ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd /bigobj /O0")
+ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /MT /bigobj /O2 /GL")
set(GLEW_STATIC ON)
else()
set(BUILD_SHARED_LIBS OFF)
@@ -800,12 +800,19 @@ if(${TREX_BUILD_OPENCV})
)
endif()
endif()
- set(OPENCV_CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+ set(OPENCV_CMAKE_ARGS "")
+
+ if(TREX_CONDA_PACKAGE_INSTALL)
+ set(OPENCV_CMAKE_ARGS ${OPENCV_CMAKE_ARGS} -DCMAKE_BUILD_TYPE=Release)
+ else()
+ set(OPENCV_CMAKE_ARGS ${OPENCV_CMAKE_ARGS} -DCMAKE_BUILD_TYPE=$<$<CONFIG:Debug>:Release>$<$<CONFIG:Release>:Debug>)
+ endif()
+ set(OPENCV_CMAKE_ARGS ${OPENCV_CMAKE_ARGS}
+ -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-DBUILD_DOCS:BOOL=FALSE
-DBUILD_EXAMPLES:BOOL=FALSE
-DBUILD_TESTS:BOOL=FALSE
- -DCMAKE_BUILD_TYPE=$<$<CONFIG:Debug>:Release>$<$<CONFIG:Release>:Debug>
-DBUILD_SHARED_LIBS:BOOL=FALSE
-DBUILD_NEW_PYTHON_SUPPORT:BOOL=OFF
-DBUILD_WITH_DEBUG_INFO=OFF
diff --git a/Application/default.settings b/Application/default.settings
index e69de29..24c8ebf 100644
--- a/Application/default.settings
+++ b/Application/default.settings
@@ -0,0 +1 @@
+python_path = "C:\Users\mooch\Anaconda3\envs\trex"
\ No newline at end of file
--
GitLab