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
fa25a70e
Commit
fa25a70e
authored
6 years ago
by
Wieland Morgenstern
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use conan CMake variables
parent
d698bab9
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
23 additions
and
6 deletions
+23
-6
CMakeLists.txt
CMakeLists.txt
+7
-0
CUDA.cmake
cmake/CUDA.cmake
+1
-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
+13
-3
No files found.
CMakeLists.txt
View file @
fa25a70e
...
@@ -130,6 +130,13 @@ if(WIN32)
...
@@ -130,6 +130,13 @@ if(WIN32)
)
)
message
(
STATUS
"CONAN_LIBS:
${
CONAN_LIBS
}
"
)
message
(
STATUS
"CONAN_LIBS:
${
CONAN_LIBS
}
"
)
message
(
STATUS
"CONAN_LIBS_LIBPNG:
${
CONAN_LIBS_LIBPNG
}
"
)
message
(
STATUS
"CONAN_LIBS_GLEW:
${
CONAN_LIBS_GLEW
}
"
)
message
(
STATUS
"CONAN_LIBS_GLFW:
${
CONAN_LIBS_GLFW
}
"
)
message
(
STATUS
"CONAN_INCLUDE_DIRS:
${
CONAN_INCLUDE_DIRS
}
"
)
message
(
STATUS
"CONAN_INCLUDE_DIRS_EIGEN:
${
CONAN_INCLUDE_DIRS_EIGEN
}
"
)
endif
()
endif
()
...
...
This diff is collapsed.
Click to expand it.
cmake/CUDA.cmake
View file @
fa25a70e
...
@@ -21,7 +21,7 @@ endif (NOT CUDA_FOUND)
...
@@ -21,7 +21,7 @@ endif (NOT CUDA_FOUND)
if
(
WINDOWS
)
if
(
WINDOWS
)
if
(
WIN_CHOCO
)
if
(
WIN_CHOCO
)
find_library
(
GLEW NAMES
${
CONAN_LIBS
}
)
find_library
(
GLEW NAMES
${
CONAN_LIBS
_GLEW
}
)
else
()
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
()
endif
()
...
...
This diff is collapsed.
Click to expand it.
cmake/external_deps.cmake
View file @
fa25a70e
...
@@ -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
)
find_library
(
PNG_LIBRARY png NAMES
${
CONAN_LIBS
}
)
set
(
PNG_LIBRARY
${
CONAN_LIBS_LIBPNG
}
)
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
()
...
...
This diff is collapsed.
Click to expand it.
lib/samples/sample-02-fullCmd/CMakeLists.txt
View file @
fa25a70e
...
@@ -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_LIBS
}
)
set
(
GLFW
${
CONAN_LIBS
_GLFW
}
)
else
()
else
()
find_library
(
GLFW glfw3 HINTS
"
${
CMAKE_EXTERNAL_LIB
}
/glfw"
REQUIRED
)
find_library
(
GLFW glfw3 HINTS
"
${
CMAKE_EXTERNAL_LIB
}
/glfw"
REQUIRED
)
endif
()
endif
()
...
...
This diff is collapsed.
Click to expand it.
lib/windows.cmake
View file @
fa25a70e
...
@@ -4,13 +4,23 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
...
@@ -4,13 +4,23 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
set
(
HID hid
)
set
(
HID hid
)
if
(
WIN_CHOCO
)
if
(
WIN_CHOCO
)
set
(
CERES_LIBS
${
CONAN_LIBS
}
)
set
(
CERES_LIBS
CONAN_LIBS_TODO_FIND_CERES
)
set
(
GLOG
${
CONAN_LIBS
}
)
set
(
GLOG
CONAN_LIBS_TODO_GLOG_CERES_DEP
)
else
()
else
()
find_debug_and_optimized_library
(
CERES_LIBS
"ceres"
"ceres-debug"
"ceres"
"ceres"
)
find_debug_and_optimized_library
(
CERES_LIBS
"ceres"
"ceres-debug"
"ceres"
"ceres"
)
find_library
(
GLOG NAMES
"libglog"
PATHS
"
${
CMAKE_EXTERNAL_LIB
}
/glog"
)
find_library
(
GLOG NAMES
"libglog"
PATHS
"
${
CMAKE_EXTERNAL_LIB
}
/glog"
)
endif
()
endif
()
set
(
EIGEN3_INCLUDE_DIRS
${
CMAKE_EXTERNAL_DEPS
}
/lib/eigen
)
if
(
WIN_CHOCO
)
set
(
EIGEN3_INCLUDE_DIRS
${
CONAN_INCLUDE_DIRS_EIGEN
}
)
else
()
set
(
EIGEN3_INCLUDE_DIRS
${
CMAKE_EXTERNAL_DEPS
}
/lib/eigen
)
endif
()
if
(
WIN_CHOCO
)
set
(
VS_LIB_SYSTEM_INCLUDES
${
VS_LIB_SYSTEM_INCLUDES
}
${
CONAN_INCLUDE_DIRS
}
)
endif
()
This diff is collapsed.
Click to expand it.
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