From f23528ca2b01d22547fb2e124c3417773047df27 Mon Sep 17 00:00:00 2001 From: pavan4 Date: Tue, 9 Jun 2020 13:18:32 -0700 Subject: [PATCH 1/3] OSX compile fix --- CMakeLists.txt | 1 + apps/texrecon/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f0006c0a..3c2a115d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,5 @@ cmake_minimum_required(VERSION 3.1) +include_directories("/usr/local/include") LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/elibs/tbb") diff --git a/apps/texrecon/CMakeLists.txt b/apps/texrecon/CMakeLists.txt index 98f9e0f2..be43e9e1 100644 --- a/apps/texrecon/CMakeLists.txt +++ b/apps/texrecon/CMakeLists.txt @@ -6,5 +6,5 @@ set(BIN texrecon) add_executable(${BIN} ${SOURCES}) set_property(TARGET ${BIN} PROPERTY INTERPROCEDURAL_OPTIMIZATION True) add_dependencies(${BIN} ext_mve) -target_link_libraries(${BIN} tex ${TBB_LIBRARIES} -lmve -lmve_util) +target_link_libraries(${BIN} tex ${TBB_LIBRARIES} OpenMP::OpenMP_CXX -lmve -lmve_util) install(TARGETS ${BIN} RUNTIME DESTINATION bin) From b50328039522cce5e6f3428575081b13e60c8f16 Mon Sep 17 00:00:00 2001 From: pavan4 Date: Wed, 23 Sep 2020 16:39:08 +0100 Subject: [PATCH 2/3] Change Eigen URL location --- elibs/CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/elibs/CMakeLists.txt b/elibs/CMakeLists.txt index ad61888a..1dafe062 100644 --- a/elibs/CMakeLists.txt +++ b/elibs/CMakeLists.txt @@ -22,8 +22,7 @@ externalproject_add(ext_rayint externalproject_add(ext_eigen PREFIX ext_eigen - URL https://bitbucket.org/eigen/eigen/get/3.3.2.tar.gz - URL_MD5 36b5731ab7d7e0c10843ac93bd9fd270 + URL https://gitlab.com/libeigen/eigen/-/archive/3.3.2/eigen-3.3.2.tar.gz SOURCE_DIR ${CMAKE_SOURCE_DIR}/elibs/eigen CONFIGURE_COMMAND "" BUILD_COMMAND "" From 2915dc2bfb42bbb47251398c5e961bbce0a53930 Mon Sep 17 00:00:00 2001 From: Pavan Date: Fri, 11 Feb 2022 14:13:23 +0000 Subject: [PATCH 3/3] tag change --- elibs/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/elibs/CMakeLists.txt b/elibs/CMakeLists.txt index 1dafe062..aa9f2cee 100644 --- a/elibs/CMakeLists.txt +++ b/elibs/CMakeLists.txt @@ -1,7 +1,7 @@ externalproject_add(ext_mapmap PREFIX ext_mapmap GIT_REPOSITORY https://github.com/dthuerck/mapmap_cpu.git - GIT_TAG master + GIT_TAG v1.5 UPDATE_COMMAND "" SOURCE_DIR ${CMAKE_SOURCE_DIR}/elibs/mapmap CONFIGURE_COMMAND ""