From d2d874d6a3e2d3935889edf71729ff88aae92a2b Mon Sep 17 00:00:00 2001 From: cDc Date: Tue, 4 Jul 2023 23:52:51 +0300 Subject: [PATCH] common: v2.2.0 --- CMakeLists.txt | 22 +--------------------- build/Templates/ConfigLocal.h.in | 6 ++++++ libs/Common/Config.h | 2 ++ libs/Common/Util.cpp | 7 +++++++ libs/IO/CMakeLists.txt | 6 +++--- 5 files changed, 19 insertions(+), 24 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 98b85630e..5a1345915 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,6 @@ ENDIF() # List configuration options SET(OpenMVS_BUILD_TOOLS ON CACHE BOOL "Build example applications") -SET(OpenMVS_USE_NONFREE ON CACHE BOOL "Build non-free (patented) functionality") SET(OpenMVS_USE_OPENMP ON CACHE BOOL "Enable OpenMP library") SET(OpenMVS_USE_OPENGL ON CACHE BOOL "Enable OpenGL library") SET(OpenMVS_USE_BREAKPAD ON CACHE BOOL "Enable BreakPad library") @@ -53,7 +52,7 @@ ENDIF() PROJECT(OpenMVS) SET(OpenMVS_MAJOR_VERSION 2) -SET(OpenMVS_MINOR_VERSION 1) +SET(OpenMVS_MINOR_VERSION 2) SET(OpenMVS_PATCH_VERSION 0) SET(OpenMVS_VERSION ${OpenMVS_MAJOR_VERSION}.${OpenMVS_MINOR_VERSION}.${OpenMVS_PATCH_VERSION}) @@ -71,7 +70,6 @@ SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/build/Modules) # Find required packages SET(OpenMVS_EXTRA_INCLUDES "") -SET(OpenMVS_DEFINITIONS "") SET(OpenMVS_EXTRA_LIBS "") if(OpenMVS_USE_OPENMP) @@ -79,7 +77,6 @@ if(OpenMVS_USE_OPENMP) FIND_PACKAGE(OpenMP) if(OPENMP_FOUND) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") - LIST(APPEND OpenMVS_DEFINITIONS -D_USE_OPENMP) SET(_USE_OPENMP TRUE) #cmake only check for separate OpenMP library on AppleClang 7+ #https://github.com/Kitware/CMake/blob/42212f7539040139ecec092547b7d58ef12a4d72/Modules/FindOpenMP.cmake#L252 @@ -99,7 +96,6 @@ if(OpenMVS_USE_OPENGL) FIND_PACKAGE(OpenGL) if(OPENGL_FOUND) INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR}) - LIST(APPEND OpenMVS_DEFINITIONS -D_USE_OPENGL) ADD_DEFINITIONS(${OpenGL_DEFINITIONS}) SET(_USE_OPENGL TRUE) else() @@ -155,7 +151,6 @@ if(OpenMVS_USE_CUDA) endif() SET(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} --expt-relaxed-constexpr") INCLUDE_DIRECTORIES(${CUDA_INCLUDE_DIRS}) - LIST(APPEND OpenMVS_DEFINITIONS -D_USE_CUDA) SET(_USE_CUDA TRUE) else() SET(CUDA_CUDA_LIBRARY "") @@ -169,7 +164,6 @@ if(OpenMVS_USE_BREAKPAD) FIND_PACKAGE(BREAKPAD) if(BREAKPAD_FOUND) INCLUDE_DIRECTORIES(${BREAKPAD_INCLUDE_DIRS}) - LIST(APPEND OpenMVS_DEFINITIONS -D_USE_BREAKPAD) ADD_DEFINITIONS(${BREAKPAD_DEFINITIONS}) SET(_USE_BREAKPAD TRUE) LIST(APPEND OpenMVS_EXTRA_LIBS ${BREAKPAD_LIBS}) @@ -194,7 +188,6 @@ FIND_PACKAGE(Boost REQUIRED COMPONENTS iostreams program_options system serializ if(Boost_FOUND) LIST(APPEND OpenMVS_EXTRA_INCLUDES ${Boost_INCLUDE_DIRS}) INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS}) - LIST(APPEND OpenMVS_DEFINITIONS -D_USE_BOOST) ADD_DEFINITIONS(${Boost_DEFINITIONS}) LINK_DIRECTORIES(${Boost_LIBRARY_DIRS}) if(NOT MSVC AND DEFINED CMAKE_TOOLCHAIN_FILE) @@ -203,7 +196,6 @@ if(Boost_FOUND) endif() SET(_USE_BOOST TRUE) if(Boost_python3_FOUND) - LIST(APPEND OpenMVS_DEFINITIONS -D_USE_BOOST_PYTHON) SET(_USE_BOOST_PYTHON TRUE) endif() endif() @@ -212,7 +204,6 @@ FIND_PACKAGE(Eigen3 REQUIRED) if(EIGEN3_FOUND) LIST(APPEND OpenMVS_EXTRA_INCLUDES ${EIGEN3_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${EIGEN3_INCLUDE_DIR}) - LIST(APPEND OpenMVS_DEFINITIONS -D_USE_EIGEN) ADD_DEFINITIONS(${EIGEN3_DEFINITIONS}) SET(_USE_EIGEN TRUE) MESSAGE(STATUS "Eigen ${EIGEN3_VERSION} found (include: ${EIGEN3_INCLUDE_DIR})") @@ -233,33 +224,22 @@ LIST(REMOVE_DUPLICATES OpenMVS_EXTRA_INCLUDES) LIST(REMOVE_DUPLICATES OpenMVS_EXTRA_LIBS) # Set defines -if(OpenMVS_USE_NONFREE) - LIST(APPEND OpenMVS_DEFINITIONS -D_USE_NONFREE) - SET(_USE_NONFREE TRUE) -endif() if(OpenMVS_USE_FAST_FLOAT2INT) - LIST(APPEND OpenMVS_DEFINITIONS -D_USE_FAST_FLOAT2INT) SET(_USE_FAST_FLOAT2INT TRUE) endif() if(OpenMVS_USE_FAST_INVSQRT) - LIST(APPEND OpenMVS_DEFINITIONS -D_USE_FAST_INVSQRT) SET(_USE_FAST_INVSQRT TRUE) endif() if(OpenMVS_USE_FAST_CBRT) - LIST(APPEND OpenMVS_DEFINITIONS -D_USE_FAST_CBRT) SET(_USE_FAST_CBRT TRUE) endif() if(OpenMVS_USE_SSE) - LIST(APPEND OpenMVS_DEFINITIONS -D_USE_SSE) SET(_USE_SSE TRUE) endif() if(OpenMVS_USE_CERES) - LIST(APPEND OpenMVS_DEFINITIONS -D_USE_CERES) SET(_USE_CERES TRUE) endif() -ADD_DEFINITIONS(${OpenMVS_DEFINITIONS}) - INCLUDE_DIRECTORIES("${OpenMVS_SOURCE_DIR}") INCLUDE_DIRECTORIES("${CMAKE_BINARY_DIR}") diff --git a/build/Templates/ConfigLocal.h.in b/build/Templates/ConfigLocal.h.in index 24ba104d3..39ac2925a 100644 --- a/build/Templates/ConfigLocal.h.in +++ b/build/Templates/ConfigLocal.h.in @@ -24,6 +24,9 @@ // Boost support #cmakedefine _USE_BOOST +// Boost with Python support +#cmakedefine _USE_BOOST_PYTHON + // Eigen Matrix & Linear Algebra Library #cmakedefine _USE_EIGEN @@ -53,6 +56,9 @@ // Fast float to int support #cmakedefine _USE_FAST_FLOAT2INT +// Fast INVSQRT support +#cmakedefine _USE_FAST_INVSQRT + // Fast CBRT support #cmakedefine _USE_FAST_CBRT diff --git a/libs/Common/Config.h b/libs/Common/Config.h index cc37aab23..d74b5c8df 100644 --- a/libs/Common/Config.h +++ b/libs/Common/Config.h @@ -10,6 +10,8 @@ // Configure everything that needs to be globally known +#include "ConfigLocal.h" + // D E F I N E S /////////////////////////////////////////////////// diff --git a/libs/Common/Util.cpp b/libs/Common/Util.cpp index 95e5f6ae8..1ae22cb66 100644 --- a/libs/Common/Util.cpp +++ b/libs/Common/Util.cpp @@ -667,6 +667,13 @@ bool OSSupportsAVX() // print details about the current build and PC void Util::LogBuild() { + LOG(_T("OpenMVS %s v%u.%u.%u"), + #ifdef _ENVIRONMENT64 + _T("x64"), + #else + _T("x32"), + #endif + OpenMVS_MAJOR_VERSION, OpenMVS_MINOR_VERSION, OpenMVS_PATCH_VERSION); #if TD_VERBOSE == TD_VERBOSE_OFF LOG(_T("Build date: ") __DATE__); #else diff --git a/libs/IO/CMakeLists.txt b/libs/IO/CMakeLists.txt index da3c15920..0f0595194 100644 --- a/libs/IO/CMakeLists.txt +++ b/libs/IO/CMakeLists.txt @@ -2,7 +2,7 @@ FIND_PACKAGE(PNG QUIET) if(PNG_FOUND) INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIRS}) - ADD_DEFINITIONS(${PNG_DEFINITIONS} -D_USE_PNG) + ADD_DEFINITIONS(${PNG_DEFINITIONS}) SET(_USE_PNG TRUE CACHE INTERNAL "") else() SET(PNG_LIBRARIES "") @@ -10,7 +10,7 @@ endif() FIND_PACKAGE(JPEG QUIET) if(JPEG_FOUND) INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR}) - ADD_DEFINITIONS(${JPEG_DEFINITIONS} -D_USE_JPG) + ADD_DEFINITIONS(${JPEG_DEFINITIONS}) SET(_USE_JPG TRUE CACHE INTERNAL "") else() SET(JPEG_LIBRARIES "") @@ -18,7 +18,7 @@ endif() FIND_PACKAGE(TIFF QUIET) if(TIFF_FOUND) INCLUDE_DIRECTORIES(${TIFF_INCLUDE_DIR}) - ADD_DEFINITIONS(${TIFF_DEFINITIONS} -D_USE_TIFF) + ADD_DEFINITIONS(${TIFF_DEFINITIONS}) SET(_USE_TIFF TRUE CACHE INTERNAL "") else() SET(TIFF_LIBRARIES "")