Skip to content

OSX compile fix #148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pavan4 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

OSX compile fix #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f23528c
OSX compile fix
pavan4 Jun 9, 2020
b503280
Change Eigen URL location
pavan4 Sep 23, 2020
2915dc2
tag change
Feb 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")

Expand Down
2 changes: 1 addition & 1 deletion apps/texrecon/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
5 changes: 2 additions & 3 deletions elibs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 ""
Expand All @@ -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 ""
Expand Down