From 579f28862bd106cc9e77856980ec985f1ecda676 Mon Sep 17 00:00:00 2001 From: Dick Hollenbeck Date: Sat, 21 Sep 2013 09:48:37 -0500 Subject: [PATCH 1/2] BUILD_GITHUB_PLUGIN issues. --- CMakeLists.txt | 4 +++- CMakeModules/download_boost.cmake | 9 ++++++--- pcbnew/github/CMakeLists.txt | 4 ++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 72269494cd..8affe7f05f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,7 +53,9 @@ option( KICAD_SCRIPTING_WXPYTHON 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. + option( BUILD_GITHUB_PLUGIN "Build the GITHUB_PLUGIN for pcbnew." OFF ) +endif() #Set version option (stable or testing) diff --git a/CMakeModules/download_boost.cmake b/CMakeModules/download_boost.cmake index 68c9cb7cfc..02361b4c69 100644 --- a/CMakeModules/download_boost.cmake +++ b/CMakeModules/download_boost.cmake @@ -104,6 +104,7 @@ if( BUILD_GITHUB_PLUGIN ) ExternalProject_Add( boost PREFIX "${PREFIX}" DOWNLOAD_DIR "${DOWNLOAD_DIR}" + INSTALL_DIR "${BOOST_ROOT}" URL http://downloads.sourceforge.net/project/boost/boost/${BOOST_RELEASE}/boost_${BOOST_VERS}.tar.bz2 URL_MD5 ${BOOST_MD5} @@ -123,14 +124,16 @@ if( BUILD_GITHUB_PLUGIN ) threading=multi toolset=gcc #link=static - --prefix=${BOOST_ROOT} + --prefix= install INSTALL_COMMAND "" ) - file( GLOB boost_libs "${BOOST_ROOT}/lib/*${CMAKE_STATIC_LIBRARY_SUFFIX}" ) - #message( STATUS BOOST_ROOT:${BOOST_ROOT} boost_libs:${boost_libs} ) + ExternalProject_Get_Property( boost install_dir ) + + file( GLOB boost_libs "${install_dir}/lib/*${CMAKE_STATIC_LIBRARY_SUFFIX}" ) + 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" ) diff --git a/pcbnew/github/CMakeLists.txt b/pcbnew/github/CMakeLists.txt index 191c27ca2e..cb4538ac8f 100644 --- a/pcbnew/github/CMakeLists.txt +++ b/pcbnew/github/CMakeLists.txt @@ -47,8 +47,8 @@ include_directories( . ${OPENSSL_INCLUDE_DIR} ${AVHTTP_INCLUDE_DIR} ) add_definitions( -DAVHTTP_ENABLE_OPENSSL ) # 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 github_plugin.cpp From b2267ec703aad99afd30d3844afa26000d24428d Mon Sep 17 00:00:00 2001 From: Dick Hollenbeck Date: Sat, 21 Sep 2013 11:06:15 -0500 Subject: [PATCH 2/2] temporarily disable GITHUB_PLUGIN --- CMakeLists.txt | 3 ++- CMakeModules/download_boost.cmake | 19 ++++++++++++------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8affe7f05f..e33bac5abc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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() diff --git a/CMakeModules/download_boost.cmake b/CMakeModules/download_boost.cmake index 02361b4c69..059e017925 100644 --- a/CMakeModules/download_boost.cmake +++ b/CMakeModules/download_boost.cmake @@ -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" )