diff --git a/.gitignore b/.gitignore index 259148fa18f9fb7ef58563f4ff15fc7b172339fb..1905f775365443b9cd482978b1b5a957bcca0c8d 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 8edc6cdfa259813665c9b57b93357f4a22d064c6..23f5893fab3befb10fb66b7d77e8a226fbbdccbe 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 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..24c8ebf0efce22b23eaf576f1dac3c266f503c07 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