Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
S
stitchEm
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Franco (nextime) Lanza
stitchEm
Commits
d698bab9
Commit
d698bab9
authored
May 11, 2019
by
Wieland Morgenstern
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use CONAN_LIBS for conan installed packages
parent
7090dc1d
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
17 additions
and
6 deletions
+17
-6
CMakeLists.txt
CMakeLists.txt
+2
-1
CUDA.cmake
cmake/CUDA.cmake
+5
-1
external_deps.cmake
cmake/external_deps.cmake
+1
-1
CMakeLists.txt
lib/samples/sample-02-fullCmd/CMakeLists.txt
+1
-1
windows.cmake
lib/windows.cmake
+8
-2
No files found.
CMakeLists.txt
View file @
d698bab9
...
@@ -121,10 +121,11 @@ if(WIN32)
...
@@ -121,10 +121,11 @@ if(WIN32)
conan_add_remote
(
NAME bincrafters URL https://api.bintray.com/conan/bincrafters/public-conan
)
conan_add_remote
(
NAME bincrafters URL https://api.bintray.com/conan/bincrafters/public-conan
)
conan_cmake_run
(
REQUIRES
conan_cmake_run
(
REQUIRES
eigen/3.3.7@conan/stable
libpng/1.6.37@bincrafters/stable
libpng/1.6.37@bincrafters/stable
glew/2.1.0@bincrafters/stable
glew/2.1.0@bincrafters/stable
glfw/3.3@bincrafters/stable
glfw/3.3@bincrafters/stable
#ceres-solver/1.12.0@jmdaly/testing
#
ceres-solver/1.12.0@jmdaly/testing
BUILD missing
BUILD missing
)
)
...
...
cmake/CUDA.cmake
View file @
d698bab9
...
@@ -20,7 +20,11 @@ endif (NOT CUDA_FOUND)
...
@@ -20,7 +20,11 @@ endif (NOT CUDA_FOUND)
# TODO: extract find_library + find_package
# TODO: extract find_library + find_package
if
(
WINDOWS
)
if
(
WINDOWS
)
if
(
WIN_CHOCO
)
find_library
(
GLEW NAMES
${
CONAN_LIBS
}
)
else
()
find_library
(
GLEW NAMES glew32s PATHS
${
CMAKE_EXTERNAL_DEPS
}
/lib/GL NO_DEFAULT_PATH
)
find_library
(
GLEW NAMES glew32s PATHS
${
CMAKE_EXTERNAL_DEPS
}
/lib/GL NO_DEFAULT_PATH
)
endif
()
include_directories
(
${
OPENGL_INCLUDE_DIRS
}
)
include_directories
(
${
OPENGL_INCLUDE_DIRS
}
)
include_directories
(
${
OPENCV_INCLUDE_DIRS
}
)
include_directories
(
${
OPENCV_INCLUDE_DIRS
}
)
find_library
(
CUDA cuda PATHS
"
${
CUDA_TOOLKIT_ROOT_DIR
}
/lib/x64"
NO_DEFAULT_PATH
)
find_library
(
CUDA cuda PATHS
"
${
CUDA_TOOLKIT_ROOT_DIR
}
/lib/x64"
NO_DEFAULT_PATH
)
...
...
cmake/external_deps.cmake
View file @
d698bab9
...
@@ -7,7 +7,7 @@ elseif(ANDROID)
...
@@ -7,7 +7,7 @@ elseif(ANDROID)
find_library
(
PNG_LIBRARY png PATHS
${
CMAKE_EXTERNAL_LIB
}
NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
)
find_library
(
PNG_LIBRARY png PATHS
${
CMAKE_EXTERNAL_LIB
}
NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
)
elseif
(
WINDOWS
)
elseif
(
WINDOWS
)
if
(
WIN_CHOCO
)
if
(
WIN_CHOCO
)
set
(
PNG_LIBRARY CONAN_PKG::libpng
)
find_library
(
PNG_LIBRARY png NAMES
${
CONAN_LIBS
}
)
else
()
else
()
find_debug_and_optimized_library
(
PNG_LIBRARY
"libpng/debug"
"libpng"
"libpng/release"
"libpng"
)
find_debug_and_optimized_library
(
PNG_LIBRARY
"libpng/debug"
"libpng"
"libpng/release"
"libpng"
)
endif
()
endif
()
...
...
lib/samples/sample-02-fullCmd/CMakeLists.txt
View file @
d698bab9
...
@@ -17,7 +17,7 @@ elseif(APPLE)
...
@@ -17,7 +17,7 @@ elseif(APPLE)
endif
()
endif
()
elseif
(
WINDOWS
)
elseif
(
WINDOWS
)
if
(
WIN_CHOCO
)
if
(
WIN_CHOCO
)
set
(
GLFW
CONAN_PKG::glfw
)
set
(
GLFW
${
CONAN_LIBS
}
)
else
()
else
()
find_library
(
GLFW glfw3 HINTS
"
${
CMAKE_EXTERNAL_LIB
}
/glfw"
REQUIRED
)
find_library
(
GLFW glfw3 HINTS
"
${
CMAKE_EXTERNAL_LIB
}
/glfw"
REQUIRED
)
endif
()
endif
()
...
...
lib/windows.cmake
View file @
d698bab9
...
@@ -3,8 +3,14 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
...
@@ -3,8 +3,14 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
set
(
HID hid
)
set
(
HID hid
)
find_debug_and_optimized_library
(
CERES_LIBS
"ceres"
"ceres-debug"
"ceres"
"ceres"
)
if
(
WIN_CHOCO
)
find_library
(
GLOG NAMES
"libglog"
PATHS
"
${
CMAKE_EXTERNAL_LIB
}
/glog"
)
set
(
CERES_LIBS
${
CONAN_LIBS
}
)
set
(
GLOG
${
CONAN_LIBS
}
)
else
()
find_debug_and_optimized_library
(
CERES_LIBS
"ceres"
"ceres-debug"
"ceres"
"ceres"
)
find_library
(
GLOG NAMES
"libglog"
PATHS
"
${
CMAKE_EXTERNAL_LIB
}
/glog"
)
endif
()
set
(
EIGEN3_INCLUDE_DIRS
${
CMAKE_EXTERNAL_DEPS
}
/lib/eigen
)
set
(
EIGEN3_INCLUDE_DIRS
${
CMAKE_EXTERNAL_DEPS
}
/lib/eigen
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment