Skip to content

Commit 8ac9500

Browse files
kayak-tomkayak-tom
committed
Hard-code Windows include paths into cmake
1 parent 438d871 commit 8ac9500

File tree

2 files changed

+278
-33
lines changed

2 files changed

+278
-33
lines changed

‎.gitignore

+216
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,216 @@
1+
#################
2+
## Eclipse
3+
#################
4+
5+
*.pydevproject
6+
.project
7+
.metadata
8+
bin/
9+
tmp/
10+
*.tmp
11+
*.bak
12+
*.swp
13+
*~.nib
14+
local.properties
15+
.classpath
16+
.settings/
17+
.loadpath
18+
19+
# External tool builders
20+
.externalToolBuilders/
21+
22+
# Locally stored "Eclipse launch configurations"
23+
*.launch
24+
25+
# CDT-specific
26+
.cproject
27+
28+
# PDT-specific
29+
.buildpath
30+
31+
32+
#################
33+
## Visual Studio
34+
#################
35+
36+
## Ignore Visual Studio temporary files, build results, and
37+
## files generated by popular Visual Studio add-ons.
38+
39+
# User-specific files
40+
*.suo
41+
*.user
42+
*.sln.docstates
43+
44+
# Build results
45+
46+
[Dd]ebug/
47+
[Rr]elease/
48+
x64/
49+
build/
50+
[Bb]in/
51+
[Oo]bj/
52+
53+
# MSTest test Results
54+
[Tt]est[Rr]esult*/
55+
[Bb]uild[Ll]og.*
56+
57+
*_i.c
58+
*_p.c
59+
*.ilk
60+
*.meta
61+
*.obj
62+
*.pch
63+
*.pdb
64+
*.pgc
65+
*.pgd
66+
*.rsp
67+
*.sbr
68+
*.tlb
69+
*.tli
70+
*.tlh
71+
*.tmp
72+
*.tmp_proj
73+
*.log
74+
*.vspscc
75+
*.vssscc
76+
.builds
77+
*.pidb
78+
*.log
79+
*.scc
80+
81+
# Visual C++ cache files
82+
ipch/
83+
*.aps
84+
*.ncb
85+
*.opensdf
86+
*.sdf
87+
*.cachefile
88+
89+
# Visual Studio profiler
90+
*.psess
91+
*.vsp
92+
*.vspx
93+
94+
# Guidance Automation Toolkit
95+
*.gpState
96+
97+
# ReSharper is a .NET coding add-in
98+
_ReSharper*/
99+
*.[Rr]e[Ss]harper
100+
101+
# TeamCity is a build add-in
102+
_TeamCity*
103+
104+
# DotCover is a Code Coverage Tool
105+
*.dotCover
106+
107+
# NCrunch
108+
*.ncrunch*
109+
.*crunch*.local.xml
110+
111+
# Installshield output folder
112+
[Ee]xpress/
113+
114+
# DocProject is a documentation generator add-in
115+
DocProject/buildhelp/
116+
DocProject/Help/*.HxT
117+
DocProject/Help/*.HxC
118+
DocProject/Help/*.hhc
119+
DocProject/Help/*.hhk
120+
DocProject/Help/*.hhp
121+
DocProject/Help/Html2
122+
DocProject/Help/html
123+
124+
# Click-Once directory
125+
publish/
126+
127+
# Publish Web Output
128+
*.Publish.xml
129+
*.pubxml
130+
*.publishproj
131+
132+
# NuGet Packages Directory
133+
## TODO: If you have NuGet Package Restore enabled, uncomment the next line
134+
#packages/
135+
136+
# Windows Azure Build Output
137+
csx
138+
*.build.csdef
139+
140+
# Windows Store app package directory
141+
AppPackages/
142+
143+
# Others
144+
sql/
145+
*.Cache
146+
ClientBin/
147+
[Ss]tyle[Cc]op.*
148+
~$*
149+
*~
150+
*.dbmdl
151+
*.[Pp]ublish.xml
152+
*.pfx
153+
*.publishsettings
154+
155+
# RIA/Silverlight projects
156+
Generated_Code/
157+
158+
# Backup & report files from converting an old project file to a newer
159+
# Visual Studio version. Backup files are not needed, because we have git ;-)
160+
_UpgradeReport_Files/
161+
Backup*/
162+
UpgradeLog*.XML
163+
UpgradeLog*.htm
164+
165+
# SQL Server files
166+
App_Data/*.mdf
167+
App_Data/*.ldf
168+
169+
#############
170+
## Windows detritus
171+
#############
172+
173+
# Windows image file caches
174+
Thumbs.db
175+
ehthumbs.db
176+
177+
# Folder config file
178+
Desktop.ini
179+
180+
# Recycle Bin used on file shares
181+
$RECYCLE.BIN/
182+
183+
# Mac crap
184+
.DS_Store
185+
186+
187+
#############
188+
## Python
189+
#############
190+
191+
*.py[cod]
192+
193+
# Packages
194+
*.egg
195+
*.egg-info
196+
dist/
197+
build/
198+
eggs/
199+
parts/
200+
var/
201+
sdist/
202+
develop-eggs/
203+
.installed.cfg
204+
205+
# Installer logs
206+
pip-log.txt
207+
208+
# Unit test / coverage reports
209+
.coverage
210+
.tox
211+
212+
#Translations
213+
*.mo
214+
215+
#Mr Developer
216+
.mr.developer.cfg

‎CMakeLists.txt

+62-33
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,23 @@
1+
#####
2+
# WINDOWS USERS: The easiest way to make cmake find boost/Eigen/OpenCV is to provide
3+
# all of the paths to library and include dirs here.
4+
#
5+
# If anyone knows how to make this work please let me know :)
6+
#
7+
#MESSAGE(STATUS "CMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME}")
8+
IF(WIN32) # (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
9+
MESSAGE(STATUS "The easiest way to make cmake find boost/Eigen/OpenCV is to provide all of the paths to library and include dirs here (NB use FORWARD SLASHES).")
10+
11+
set(Boost_INCLUDE_DIR "G:/Users/Tom Botterill/Documents/lib/boost_1_55_0")
12+
set(OpenCV_INCLUDE_DIR "G:/Users/Tom Botterill/Documents/lib/opencv/opencv/build/include")
13+
set(EIGEN3_INCLUDE_DIR "G:/Users/Tom Botterill/Documents/lib/eigen")
14+
set(Boost_LIBRARY_DIRS "G:/Users/Tom Botterill/Documents/lib/boost_1_55_0/stage/lib")
15+
set(OpenCV_LIBRARIES "G:/Users/Tom Botterill/Documents/lib/opencv/opencv/build/x64/vc12/lib")
16+
endif()
17+
18+
######################
19+
20+
121
cmake_minimum_required (VERSION 2.6)
222
project(tom-cv)
323

@@ -33,14 +53,21 @@ endif()
3353

3454
set(LIBRARY_OUTPUT_PATH "../${CMAKE_BUILD_TYPE}")
3555

36-
find_package (Boost 1.54.0 REQUIRED COMPONENTS system filesystem thread)
56+
57+
IF(NOT Boost_INCLUDE_DIR)
58+
find_package (Boost 1.54.0 REQUIRED COMPONENTS system filesystem thread)
59+
ENDIF()
60+
3761
include_directories (SYSTEM ${Boost_INCLUDE_DIR})
3862
message(STATUS "boost include dir= ${Boost_INCLUDE_DIR}")
3963

4064
#############
4165

4266
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ./cmake)
43-
find_package(OpenCV 2.4 REQUIRED COMPONENTS opencv_core opencv_highgui opencv_imgproc opencv_legacy opencv_ml opencv_calib3d)
67+
68+
IF(NOT OpenCV_INCLUDE_DIR)
69+
find_package(OpenCV 2.4 REQUIRED COMPONENTS opencv_core opencv_highgui opencv_imgproc opencv_legacy opencv_ml opencv_calib3d)
70+
endif()
4471

4572
message(STATUS "opencv include dir= ${OpenCV_INCLUDE_DIR}")
4673
message(STATUS "opencv root dir+include= ${OpenCV_ROOT_DIR}/include")
@@ -52,8 +79,9 @@ include_directories(SYSTEM ${OpenCV_INCLUDE_DIR})
5279
include_directories(SYSTEM "${OpenCV_ROOT_DIR}/include")
5380

5481
#############
55-
56-
FIND_PACKAGE(Eigen3 3.1 REQUIRED)
82+
IF(NOT EIGEN3_INCLUDE_DIR)
83+
FIND_PACKAGE(Eigen3 3.1 REQUIRED)
84+
ENDIF()
5785

5886
message(STATUS "Eigen3 include dir= ${EIGEN3_INCLUDE_DIR}")
5987

@@ -78,48 +106,49 @@ add_subdirectory(image)
78106
add_subdirectory(imageSource)
79107

80108
################################################### set up libraries to link to
109+
IF(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
81110

82-
link_libraries(featureExtract)
111+
link_libraries(featureExtract)
83112

84-
link_libraries(imageSource)
113+
link_libraries(imageSource)
85114

86-
link_libraries(params)
87-
link_libraries(logging)
88-
link_libraries(ransac)
89-
link_libraries(bagOfWords)
90-
link_libraries(bowSpeedometer)
91-
link_libraries(featureDescription)
92-
link_libraries(featureMatching)
93-
link_libraries(image)
115+
link_libraries(params)
116+
link_libraries(logging)
117+
link_libraries(ransac)
118+
link_libraries(bagOfWords)
119+
link_libraries(bowSpeedometer)
120+
link_libraries(featureDescription)
121+
link_libraries(featureMatching)
122+
link_libraries(image)
94123

95-
link_libraries(${Boost_LIBRARIES})
96-
link_libraries(opencv_core)
97-
link_libraries(opencv_imgproc)
98-
link_libraries(opencv_calib3d)
99-
link_libraries(opencv_highgui)
100-
link_libraries(opencv_features2d)
101-
link_libraries(opencv_legacy)
124+
link_libraries(${Boost_LIBRARIES})
125+
link_libraries(opencv_core)
126+
link_libraries(opencv_imgproc)
127+
link_libraries(opencv_calib3d)
128+
link_libraries(opencv_highgui)
129+
link_libraries(opencv_features2d)
130+
link_libraries(opencv_legacy)
102131

103132

104-
link_libraries(cameraGeom)
105-
link_libraries(timing)
133+
link_libraries(cameraGeom)
134+
link_libraries(timing)
106135

107136

108137

109-
link_libraries(util)
138+
link_libraries(util)
110139

111-
link_libraries(png)
112-
link_libraries(jpeg)
140+
link_libraries(png)
141+
link_libraries(jpeg)
113142

114143

115144
################################################### build the example programs
116145

117-
add_subdirectory(ransacTest)
118-
add_subdirectory(ransacAndRefine)
119-
add_subdirectory(bowExample)
120-
121-
add_subdirectory(mosaicing)
122-
add_subdirectory(BoWSLAM)
123-
add_subdirectory(ShowIm) # needed for BoWSLAM
146+
add_subdirectory(ransacTest)
147+
add_subdirectory(ransacAndRefine)
148+
add_subdirectory(bowExample)
124149

150+
add_subdirectory(mosaicing)
151+
add_subdirectory(BoWSLAM)
152+
add_subdirectory(ShowIm) # needed for BoWSLAM
125153

154+
ENDIF()

0 commit comments

Comments
 (0)