From 2d9f8cac3d3ae4cca465f93713518bc22ed988f9 Mon Sep 17 00:00:00 2001 From: Sergey Yershov Date: Thu, 3 Nov 2016 16:36:21 +0300 Subject: [PATCH 1/2] Fix CMake build --- tracking/pytracking/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tracking/pytracking/CMakeLists.txt b/tracking/pytracking/CMakeLists.txt index a26498469b..41a0d33235 100644 --- a/tracking/pytracking/CMakeLists.txt +++ b/tracking/pytracking/CMakeLists.txt @@ -21,5 +21,5 @@ include_directories(${PYTHON_INCLUDE_DIRS}) add_library(${PROJECT_NAME} MODULE ${SRC}) -omim_link_libraries(${PROJECT_NAME} ${PYTHON_LIBRARIES} ${Boost_LIBRARIES} base geometry coding tracking) +omim_link_libraries(${PROJECT_NAME} ${PYTHON_LIBRARIES} ${Boost_LIBRARIES} tracking coding geometry base) set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "") From cd4b4bcf6f8653183146a271970f9328648fa77e Mon Sep 17 00:00:00 2001 From: Sergey Yershov Date: Thu, 3 Nov 2016 16:40:05 +0300 Subject: [PATCH 2/2] Fix Cmake Relese build --- CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 85f8fa55d3..e8af8fc9ab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,12 +39,16 @@ include_directories( set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}) set(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}) +if (NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE "Release") +endif() + if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") add_definitions(-DDEBUG) endif() -if (NOT CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE "Release") +if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release") + add_definitions(-DRELEASE) endif() if (NOT NO_TESTS)