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
3053d45b
Commit
3053d45b
authored
Sep 21, 2013
by
Dick Hollenbeck
Browse files
Options
Browse Files
Download
Plain Diff
temporarily disable GITHUB_PLUGIN
parents
95b67c8b
b2267ec7
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
10 deletions
+21
-10
CMakeLists.txt
CMakeLists.txt
+4
-1
download_boost.cmake
CMakeModules/download_boost.cmake
+15
-7
CMakeLists.txt
pcbnew/github/CMakeLists.txt
+2
-2
No files found.
CMakeLists.txt
View file @
3053d45b
...
@@ -53,7 +53,10 @@ option( KICAD_SCRIPTING_WXPYTHON
...
@@ -53,7 +53,10 @@ option( KICAD_SCRIPTING_WXPYTHON
option
(
USE_FP_LIB_TABLE
"Use the new footprint library table implementation. ( default OFF)"
)
option
(
USE_FP_LIB_TABLE
"Use the new footprint library table implementation. ( default OFF)"
)
option
(
BUILD_GITHUB_PLUGIN
"Build the GITHUB_PLUGIN for pcbnew."
OFF
)
if
(
NOT MINGW
)
# BUILD_GITHUB_PLUGIN is not MINGW ready yet.
# still have some build problems, even on linux
#option( BUILD_GITHUB_PLUGIN "Build the GITHUB_PLUGIN for pcbnew." OFF )
endif
()
#Set version option (stable or testing)
#Set version option (stable or testing)
...
...
CMakeModules/download_boost.cmake
View file @
3053d45b
...
@@ -50,7 +50,7 @@ if( BUILD_GITHUB_PLUGIN )
...
@@ -50,7 +50,7 @@ if( BUILD_GITHUB_PLUGIN )
program_options
program_options
regex
regex
#signals
#signals
#
system
system
thread
thread
unit_test_framework
unit_test_framework
)
)
...
@@ -73,12 +73,17 @@ set( PREFIX ${DOWNLOAD_DIR}/boost_${BOOST_VERS} )
...
@@ -73,12 +73,17 @@ set( PREFIX ${DOWNLOAD_DIR}/boost_${BOOST_VERS} )
set
(
headers_src
"
${
PREFIX
}
/src/boost/boost"
)
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
)
function
(
set_boost_lib_names libs output
)
foreach
(
lib
${
libs
}
)
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
}
"
)
message
(
STATUS
"fullpath_lib:
${
fullpath_lib
}
"
)
set
(
output
${
output
}
${
fullpath_lib
}
)
list
(
APPEND output
${
fullpath_lib
}
)
endif
()
message
(
STATUS
"lib:
${
lib
}
"
)
endforeach
()
endforeach
()
endfunction
()
endfunction
()
...
@@ -104,6 +109,7 @@ if( BUILD_GITHUB_PLUGIN )
...
@@ -104,6 +109,7 @@ if( BUILD_GITHUB_PLUGIN )
ExternalProject_Add
(
boost
ExternalProject_Add
(
boost
PREFIX
"
${
PREFIX
}
"
PREFIX
"
${
PREFIX
}
"
DOWNLOAD_DIR
"
${
DOWNLOAD_DIR
}
"
DOWNLOAD_DIR
"
${
DOWNLOAD_DIR
}
"
INSTALL_DIR
"
${
BOOST_ROOT
}
"
URL http://downloads.sourceforge.net/project/boost/boost/
${
BOOST_RELEASE
}
/boost_
${
BOOST_VERS
}
.tar.bz2
URL http://downloads.sourceforge.net/project/boost/boost/
${
BOOST_RELEASE
}
/boost_
${
BOOST_VERS
}
.tar.bz2
URL_MD5
${
BOOST_MD5
}
URL_MD5
${
BOOST_MD5
}
...
@@ -123,14 +129,16 @@ if( BUILD_GITHUB_PLUGIN )
...
@@ -123,14 +129,16 @@ if( BUILD_GITHUB_PLUGIN )
threading=multi
threading=multi
toolset=gcc
toolset=gcc
#link=static
#link=static
--prefix=
${
BOOST_ROOT
}
--prefix=
<INSTALL_DIR>
install
install
INSTALL_COMMAND
""
INSTALL_COMMAND
""
)
)
file
(
GLOB boost_libs
"
${
BOOST_ROOT
}
/lib/*
${
CMAKE_STATIC_LIBRARY_SUFFIX
}
"
)
#file( GLOB boost_libs "${BOOST_ROOT}/lib/*${CMAKE_STATIC_LIBRARY_SUFFIX}" )
#message( STATUS BOOST_ROOT:${BOOST_ROOT} boost_libs:${boost_libs} )
set_boost_lib_names
(
${
BOOST_LIBS_BUILT
}
boost_libs
)
message
(
STATUS
"BOOST_ROOT:
${
BOOST_ROOT
}
boost_libs:
${
boost_libs
}
"
)
set
(
Boost_LIBRARIES
${
boost_libs
}
CACHE FILEPATH
"Boost libraries directory"
)
set
(
Boost_LIBRARIES
${
boost_libs
}
CACHE FILEPATH
"Boost libraries directory"
)
set
(
Boost_INCLUDE_DIR
"
${
BOOST_ROOT
}
/include"
CACHE FILEPATH
"Boost include directory"
)
set
(
Boost_INCLUDE_DIR
"
${
BOOST_ROOT
}
/include"
CACHE FILEPATH
"Boost include directory"
)
...
...
pcbnew/github/CMakeLists.txt
View file @
3053d45b
...
@@ -47,8 +47,8 @@ include_directories( . ${OPENSSL_INCLUDE_DIR} ${AVHTTP_INCLUDE_DIR} )
...
@@ -47,8 +47,8 @@ include_directories( . ${OPENSSL_INCLUDE_DIR} ${AVHTTP_INCLUDE_DIR} )
add_definitions
(
-DAVHTTP_ENABLE_OPENSSL
)
add_definitions
(
-DAVHTTP_ENABLE_OPENSSL
)
# tone down the compiler warnings for avhttp header library:
# tone down the compiler warnings for avhttp header library:
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-Wno-sign-compare -Wno-reorder -Wno-unused-variable -Wno-unused-function"
)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-Wno-sign-compare -Wno-reorder -Wno-unused-variable -Wno-unused-function -Wno-strict-aliasing"
)
set
(
GITHUB_PLUGIN_SRCS
set
(
GITHUB_PLUGIN_SRCS
github_plugin.cpp
github_plugin.cpp
...
...
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