Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
kicad-source-mirror
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
kicad-source-mirror
Commits
a7e32b03
Commit
a7e32b03
authored
Aug 26, 2013
by
Dick Hollenbeck
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
switch to newer boost version.
parent
0c2e03ae
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
24 additions
and
19 deletions
+24
-19
download_boost.cmake
CMakeModules/download_boost.cmake
+24
-19
No files found.
CMakeModules/download_boost.cmake
View file @
a7e32b03
...
@@ -29,8 +29,13 @@
...
@@ -29,8 +29,13 @@
#-----<configure>----------------------------------------------------------------
#-----<configure>----------------------------------------------------------------
set
(
BOOST_RELEASE 1.53.0
)
if
(
false
)
set
(
BOOST_MD5 a00d22605d5dbcfb4c9936a9b35bc4c2
)
# re-calc this on every RELEASE change
set
(
BOOST_RELEASE 1.53.0
)
set
(
BOOST_MD5 a00d22605d5dbcfb4c9936a9b35bc4c2
)
# re-calc this on every RELEASE change
else
()
set
(
BOOST_RELEASE 1.54.0
)
set
(
BOOST_MD5 15cb8c0803064faef0c4ddf5bc5ca279
)
# re-calc this on every RELEASE change
endif
()
# The boost headers [and static libs if built] go here, at the top of KiCad
# The boost headers [and static libs if built] go here, at the top of KiCad
# source tree in boost_root.
# source tree in boost_root.
...
@@ -40,13 +45,13 @@ set( BOOST_ROOT "${PROJECT_SOURCE_DIR}/boost_root" )
...
@@ -40,13 +45,13 @@ set( BOOST_ROOT "${PROJECT_SOURCE_DIR}/boost_root" )
if
(
BUILD_GITHUB_PLUGIN
)
if
(
BUILD_GITHUB_PLUGIN
)
# Space separated list which indicates the subset of boost libraries to compile.
# Space separated list which indicates the subset of boost libraries to compile.
set
(
BOOST_LIBS_BUILT
set
(
BOOST_LIBS_BUILT
filesystem
#
filesystem
system
system
regex
#
regex
program_options
#
program_options
date_time
#
date_time
thread
#
thread
exception
#
exception
unit_test_framework
unit_test_framework
)
)
endif
()
endif
()
...
@@ -69,22 +74,17 @@ set( headers_src "${PREFIX}/src/boost/boost" )
...
@@ -69,22 +74,17 @@ set( headers_src "${PREFIX}/src/boost/boost" )
# don't look at this:
# don't look at this:
function
(
set_boost_lib_names libs
)
function
(
set_boost_lib_names libs output
)
foreach
(
lib IN LISTS
${
libs
}
)
foreach
(
lib
${
libs
}
)
string
(
TOUPPER
${
lib
}
LIB
)
set
(
fullpath_lib,
"
${
BOOST_ROOT
}
/lib/libboost_
${
lib
}
.a"
)
message
(
STATUS
"LIB:
${
LIB
}
lib:
${
lib
}
"
)
message
(
STATUS
"fullpath_lib:
${
fullpath_lib
}
"
)
set
(
Boost_
${
LIB
}
_LIBRARY,
"
${
BOOST_ROOT
}
/lib/libboost_
${
lib
}
.a"
PARENT_SCOPE
)
set
(
output
${
output
}
${
fullpath_lib
}
)
set
(
Boost_LIBRARIES
${
Boost_LIBRARIES
}
${
Boost_
${
LIB
}
_LIBRARY
}
PARENT_SCOPE
)
endforeach
()
endforeach
()
endfunction
()
endfunction
()
if
(
BUILD_GITHUB_PLUGIN
)
if
(
BUILD_GITHUB_PLUGIN
)
message
(
FATAL_ERROR
"BUILD_GITHUB_PLUGIN not functional. With this commit we get merely a greenfield for better boost usage and building."
)
# (BTW "test" yields "unit_test_framework" when passed to bootstrap.{sh,bat} ).
# (BTW "test" yields "unit_test_framework" when passed to bootstrap.{sh,bat} ).
message
(
STATUS
"BOOST_LIBS_BUILT:
${
BOOST_LIBS_BUILT
}
"
)
message
(
STATUS
"BOOST_LIBS_BUILT:
${
BOOST_LIBS_BUILT
}
"
)
string
(
REPLACE
"unit_test_framework"
"test"
libs_csv
"
${
BOOST_LIBS_BUILT
}
"
)
string
(
REPLACE
"unit_test_framework"
"test"
libs_csv
"
${
BOOST_LIBS_BUILT
}
"
)
...
@@ -127,6 +127,11 @@ if( BUILD_GITHUB_PLUGIN )
...
@@ -127,6 +127,11 @@ if( BUILD_GITHUB_PLUGIN )
INSTALL_COMMAND
""
INSTALL_COMMAND
""
)
)
file
(
GLOB boost_libs
"
${
BOOST_ROOT
}
/lib/*"
)
#message( STATUS BOOST_ROOT:${BOOST_ROOT} boost_libs:${boost_libs} )
set
(
Boost_LIBRARIES
${
boost_libs
}
CACHE FILEPATH
"Boost libraries directory"
)
set
(
Boost_INCLUDE_DIR
"
${
BOOST_ROOT
}
/include"
CACHE FILEPATH
"Boost include directory"
)
else
(
BUILD_GITHUB_PLUGIN
)
else
(
BUILD_GITHUB_PLUGIN
)
...
@@ -154,7 +159,7 @@ else( BUILD_GITHUB_PLUGIN )
...
@@ -154,7 +159,7 @@ else( BUILD_GITHUB_PLUGIN )
)
)
# Until my find_package() support is done for my boost.
# Until my find_package() support is done for my boost.
set
(
Boost_INCLUDE_DIR
"
${
BOOST_ROOT
}
/include"
CACHE FILEPATH
"Boost
library
directory"
)
set
(
Boost_INCLUDE_DIR
"
${
BOOST_ROOT
}
/include"
CACHE FILEPATH
"Boost
include
directory"
)
endif
(
BUILD_GITHUB_PLUGIN
)
endif
(
BUILD_GITHUB_PLUGIN
)
...
...
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