Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #5 from udovicic/master

missing(?) executable
  • Loading branch information...
commit ede940e5501a4ae1c202164195519fc88f7baad2 2 parents 018e85e + 2c84966
@royshil authored
Showing with 9 additions and 4 deletions.
  1. +6 −0 CMakeLists.txt
  2. +3 −4 SfMToyLib/CMakeLists.txt
View
6 CMakeLists.txt
@@ -77,6 +77,12 @@ ELSE()
)
endif()
+if(OPENMP_FOUND)
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}")
+endif()
+
target_link_libraries(SfMToyUI
SfMToyLibrary
${OpenCV_LIBS}
View
7 SfMToyLib/CMakeLists.txt
@@ -6,7 +6,7 @@ if(EIGEN_INCLUDE_DIRS) # if compiling with PCL, it will bring Eigen with it
add_definitions( -DUSE_EIGEN )
endif()
-set(SSBA_LIBRARY_DIR "${CMAKE_SOURCE_DIR}/../3rdparty/SSBA-3.0/build" CACHE PATH "Directory to find SSBA libs")
+set(SSBA_LIBRARY_DIR "${CMAKE_SOURCE_DIR}/3rdparty/SSBA-3.0/build" CACHE PATH "Directory to find SSBA libs")
set(USE_SSBA ON CACHE BOOL "Build using the SSBA-3.0 library?")
if(USE_SSBA)
@@ -42,19 +42,18 @@ file(GLOB SFM_LIB_SOURCES
)
add_library(SfMToyLibrary ${SFM_LIB_SOURCES} )
-
if(MSVC)
set_target_properties(SfMToyLibrary PROPERTIES COMPILE_FLAGS "/openmp")
if(USE_SSBA)
target_link_libraries(SfMToyLibrary V3D COLAMD )
endif(USE_SSBA)
endif()
-if(APPLE)
+if(UNIX)
if(USE_SSBA)
# default is to build SSBA as static libs...
target_link_libraries(SfMToyLibrary
"${SSBA_LIBRARY_DIR}/libV3D.a"
- "${SSBA_LIBRARY_DIR}/libCOLAMD.a"
+ "${SSBA_LIBRARY_DIR}/libcolamd.a"
)
endif(USE_SSBA)
set_target_properties(SfMToyLibrary PROPERTIES COMPILE_FLAGS "-fopenmp")
Please sign in to comment.
Something went wrong with that request. Please try again.