File tree 1 file changed +14
-9
lines changed
1 file changed +14
-9
lines changed Original file line number Diff line number Diff line change @@ -49,7 +49,20 @@ set(Boost_USE_MULTITHREADED ON)
49
49
if (MSVC )
50
50
set (Boost_USE_STATIC_RUNTIME ON )
51
51
endif ()
52
- find_package (Boost 1.46.0 REQUIRED COMPONENTS filesystem regex signals system locale)
52
+
53
+ if (NOT BOOST_USE_CXX11)
54
+ add_definitions ("-DBOOST_NO_CXX11_SCOPED_ENUMS" )
55
+ endif ()
56
+
57
+ set (BOOST_COMPONENTS filesystem regex system locale)
58
+
59
+ if (BOOST_USE_SIGNALS2)
60
+ add_definitions ("-DBOOST_SIGNALS2" )
61
+ else ()
62
+ set (BOOST_COMPONENTS ${BOOST_COMPONENTS} singals)
63
+ endif ()
64
+
65
+ find_package (Boost 1.46.0 REQUIRED COMPONENTS ${BOOST_COMPONENTS} )
53
66
if (Boost_FOUND)
54
67
include_directories (${Boost_INCLUDE_DIRS} )
55
68
link_directories (${Boost_LIBRARY_DIRS} )
@@ -136,14 +149,6 @@ if(UNIX)
136
149
add_definitions ("-std=c++11" )
137
150
endif ()
138
151
139
- if (NOT BOOST_USE_CXX11)
140
- add_definitions ("-DBOOST_NO_CXX11_SCOPED_ENUMS" )
141
- endif ()
142
-
143
- if (BOOST_USE_SIGNALS2)
144
- add_definitions ("-DBOOST_SIGNALS2" )
145
- endif ()
146
-
147
152
if (NOT DEFINED LIB_INSTALL_DIR)
148
153
set (LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX} /lib${LIB_SUFFIX} )
149
154
endif ()
You can’t perform that action at this time.
0 commit comments