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
b2267ec7
Commit
b2267ec7
authored
Sep 21, 2013
by
Dick Hollenbeck
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
temporarily disable GITHUB_PLUGIN
parent
579f2886
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
8 deletions
+14
-8
CMakeLists.txt
CMakeLists.txt
+2
-1
download_boost.cmake
CMakeModules/download_boost.cmake
+12
-7
No files found.
CMakeLists.txt
View file @
b2267ec7
...
...
@@ -54,7 +54,8 @@ option( KICAD_SCRIPTING_WXPYTHON
option
(
USE_FP_LIB_TABLE
"Use the new footprint library table implementation. ( default OFF)"
)
if
(
NOT MINGW
)
# BUILD_GITHUB_PLUGIN is not MINGW ready yet.
option
(
BUILD_GITHUB_PLUGIN
"Build the GITHUB_PLUGIN for pcbnew."
OFF
)
# still have some build problems, even on linux
#option( BUILD_GITHUB_PLUGIN "Build the GITHUB_PLUGIN for pcbnew." OFF )
endif
()
...
...
CMakeModules/download_boost.cmake
View file @
b2267ec7
...
...
@@ -50,7 +50,7 @@ if( BUILD_GITHUB_PLUGIN )
program_options
regex
#signals
#
system
system
thread
unit_test_framework
)
...
...
@@ -73,12 +73,17 @@ set( PREFIX ${DOWNLOAD_DIR}/boost_${BOOST_VERS} )
set
(
headers_src
"
${
PREFIX
}
/src/boost/boost"
)
# don't look at this, not used, not working, not needed at this time.
function
(
set_boost_lib_names libs output
)
foreach
(
lib
${
libs
}
)
set
(
fullpath_lib,
"
${
BOOST_ROOT
}
/lib/libboost_
${
lib
}
.a"
)
if
(
false
)
set
(
fullpath_lib,
"
${
BOOST_ROOT
}
/lib/libboost_
${
lib
}
.
${
CMAKE_STATIC_LIBRARY_SUFFIX
}
"
)
message
(
STATUS
"fullpath_lib:
${
fullpath_lib
}
"
)
set
(
output
${
output
}
${
fullpath_lib
}
)
list
(
APPEND output
${
fullpath_lib
}
)
endif
()
message
(
STATUS
"lib:
${
lib
}
"
)
endforeach
()
endfunction
()
...
...
@@ -130,10 +135,10 @@ if( BUILD_GITHUB_PLUGIN )
INSTALL_COMMAND
""
)
ExternalProject_Get_Property
(
boost install_dir
)
#file( GLOB boost_libs "${BOOST_ROOT}/lib/*${CMAKE_STATIC_LIBRARY_SUFFIX}" )
set_boost_lib_names
(
${
BOOST_LIBS_BUILT
}
boost_libs
)
file
(
GLOB boost_libs
"
${
install_dir
}
/lib/*
${
CMAKE_STATIC_LIBRARY_SUFFIX
}
"
)
message
(
STATUS BOOST_ROOT:
${
BOOST_ROOT
}
boost_libs:
${
boost_libs
}
)
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"
)
...
...
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