Browse Source

changed structure of extdep

cl-refactor
Marek Kotewicz 10 years ago
parent
commit
7b0688378a
  1. 30
      extdep/CMakeLists.txt
  2. 0
      extdep/cmake/FindCURL.cmake
  3. 0
      extdep/compile/argtable2.cmake
  4. 0
      extdep/compile/cryptopp.cmake
  5. 0
      extdep/compile/curl.cmake
  6. 0
      extdep/compile/icu.cmake
  7. 0
      extdep/compile/jom.cmake
  8. 4
      extdep/compile/json-rpc-cpp.cmake
  9. 0
      extdep/compile/jsoncpp.cmake
  10. 2
      extdep/compile/leveldb.cmake
  11. 0
      extdep/compile/leveldb_osx.patch
  12. 6
      extdep/compile/qt.cmake
  13. 0
      extdep/compile/qt_configure.bat
  14. 0
      extdep/compile/qt_osx.patch
  15. 0
      extdep/compile/qt_tools.bat
  16. 0
      extdep/compile/snappy.cmake
  17. 8
      extdep/precompiled/json-rpc-cpp.cmake

30
extdep/CMakeLists.txt

@ -5,20 +5,30 @@ include(ExternalProject)
# all dependencies will be installed into this directory, separated by platform # all dependencies will be installed into this directory, separated by platform
string(TOLOWER ${CMAKE_SYSTEM_NAME} _system_name) string(TOLOWER ${CMAKE_SYSTEM_NAME} _system_name)
set(ETH_DEPENDENCY_INSTALL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/install/${_system_name}") set(ETH_DEPENDENCY_INSTALL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/install/${_system_name}")
set(ETH_DEPENDENCY_SERVER "http://poc-7.ethdev.com/precompiled/${_system_name}")
file(MAKE_DIRECTORY ${ETH_DEPENDENCY_INSTALL_DIR}/lib) file(MAKE_DIRECTORY ${ETH_DEPENDENCY_INSTALL_DIR}/lib)
file(MAKE_DIRECTORY ${ETH_DEPENDENCY_INSTALL_DIR}/include) file(MAKE_DIRECTORY ${ETH_DEPENDENCY_INSTALL_DIR}/include)
file(MAKE_DIRECTORY ${ETH_DEPENDENCY_INSTALL_DIR}/bin) file(MAKE_DIRECTORY ${ETH_DEPENDENCY_INSTALL_DIR}/bin)
include(icu.cmake) if (ETH_COMPILE)
include(jom.cmake) # json-rpc-cpp and its dependencies
include(qt.cmake) include(compile/jsoncpp.cmake)
include(curl.cmake) include(compile/argtable2.cmake)
include(jsoncpp.cmake) include(compile/curl.cmake)
include(argtable2.cmake) include(compile/json-rpc-cpp.cmake)
include(json-rpc-cpp.cmake)
include(cryptopp.cmake) # qt at its dependencies
include(snappy.cmake) include(compile/icu.cmake)
include(leveldb.cmake) include(compile/jom.cmake)
include(compile/qt.cmake)
# leveldb and its dependencies
include(compile/snappy.cmake)
include(compile/leveldb.cmake)
else()
include(precompiled/json-rpc-cpp.cmake)
endif()
# will be re-eanbled later # will be re-eanbled later
# include(miniupnpc.cmake) # include(miniupnpc.cmake)

0
extdep/FindCURL.cmake → extdep/cmake/FindCURL.cmake

0
extdep/argtable2.cmake → extdep/compile/argtable2.cmake

0
extdep/cryptopp.cmake → extdep/compile/cryptopp.cmake

0
extdep/curl.cmake → extdep/compile/curl.cmake

0
extdep/icu.cmake → extdep/compile/icu.cmake

0
extdep/jom.cmake → extdep/compile/jom.cmake

4
extdep/json-rpc-cpp.cmake → extdep/compile/json-rpc-cpp.cmake

@ -9,7 +9,7 @@ ExternalProject_Add(json-rpc-cpp
GIT_REPOSITORY https://github.com/cinemast/libjson-rpc-cpp.git GIT_REPOSITORY https://github.com/cinemast/libjson-rpc-cpp.git
GIT_TAG v0.3.2 GIT_TAG v0.3.2
BINARY_DIR json-rpc-cpp-prefix/src/json-rpc-cpp BINARY_DIR json-rpc-cpp-prefix/src/json-rpc-cpp
CONFIGURE_COMMAND cmake -DCMAKE_INSTALL_PREFIX=${ETH_DEPENDENCY_INSTALL_DIR} -DCMAKE_MODULE_PATH:PATH=${CMAKE_CURRENT_SOURCE_DIR} -DETH_DEPENDENCY_INSTALL_DIR:PATH=${ETH_DEPENDENCY_INSTALL_DIR} -DCMAKE_BUILD_TYPE=None -DCMAKE_FIND_FRAMEWORK=LAST -Wno-dev . CONFIGURE_COMMAND cmake -DCMAKE_INSTALL_PREFIX=${ETH_DEPENDENCY_INSTALL_DIR} -DCMAKE_MODULE_PATH:PATH=${CMAKE_CURRENT_SOURCE_DIR}/cmake -DETH_DEPENDENCY_INSTALL_DIR:PATH=${ETH_DEPENDENCY_INSTALL_DIR} -DCMAKE_BUILD_TYPE=None -DCMAKE_FIND_FRAMEWORK=LAST -Wno-dev .
BUILD_COMMAND make -j 3 BUILD_COMMAND make -j 3
INSTALL_COMMAND make install INSTALL_COMMAND make install
) )
@ -31,7 +31,7 @@ ExternalProject_Add(json-rpc-cpp
GIT_REPOSITORY https://github.com/cinemast/libjson-rpc-cpp.git GIT_REPOSITORY https://github.com/cinemast/libjson-rpc-cpp.git
GIT_TAG v0.3.2 GIT_TAG v0.3.2
BINARY_DIR json-rpc-cpp-prefix/src/json-rpc-cpp BINARY_DIR json-rpc-cpp-prefix/src/json-rpc-cpp
CONFIGURE_COMMAND cmake -DCMAKE_INSTALL_PREFIX=${ETH_DEPENDENCY_INSTALL_DIR} -DCMAKE_MODULE_PATH:PATH=${CMAKE_CURRENT_SOURCE_DIR} -DETH_DEPENDENCY_INSTALL_DIR:PATH=${ETH_DEPENDENCY_INSTALL_DIR} -DCMAKE_BUILD_TYPE=None -DCMAKE_FIND_FRAMEWORK=LAST . CONFIGURE_COMMAND cmake -DCMAKE_INSTALL_PREFIX=${ETH_DEPENDENCY_INSTALL_DIR} -DCMAKE_MODULE_PATH:PATH=${CMAKE_CURRENT_SOURCE_DIR}/cmake -DETH_DEPENDENCY_INSTALL_DIR:PATH=${ETH_DEPENDENCY_INSTALL_DIR} -DCMAKE_BUILD_TYPE=None -DCMAKE_FIND_FRAMEWORK=LAST .
BUILD_COMMAND make -j 3 BUILD_COMMAND make -j 3
INSTALL_COMMAND make install INSTALL_COMMAND make install
) )

0
extdep/jsoncpp.cmake → extdep/compile/jsoncpp.cmake

2
extdep/leveldb.cmake → extdep/compile/leveldb.cmake

@ -3,7 +3,7 @@ ExternalProject_Add(leveldb
DEPENDS snappy DEPENDS snappy
URL https://leveldb.googlecode.com/files/leveldb-1.15.0.tar.gz URL https://leveldb.googlecode.com/files/leveldb-1.15.0.tar.gz
BINARY_DIR leveldb-prefix/src/leveldb BINARY_DIR leveldb-prefix/src/leveldb
CONFIGURE_COMMAND patch < ${CMAKE_CURRENT_SOURCE_DIR}/leveldb_osx.patch CONFIGURE_COMMAND patch < ${CMAKE_CURRENT_SOURCE_DIR}/compile/leveldb_osx.patch
BUILD_COMMAND export ETH_DEPENDENCY_INSTALL_DIR=${ETH_DEPENDENCY_INSTALL_DIR} && make -j 3 BUILD_COMMAND export ETH_DEPENDENCY_INSTALL_DIR=${ETH_DEPENDENCY_INSTALL_DIR} && make -j 3
INSTALL_COMMAND cp -rf include/leveldb ${ETH_DEPENDENCY_INSTALL_DIR}/include/ && cp libleveldb.a ${ETH_DEPENDENCY_INSTALL_DIR}/lib && cp libleveldb.dylib.1.15 ${ETH_DEPENDENCY_INSTALL_DIR}/lib/libleveldb.dylib INSTALL_COMMAND cp -rf include/leveldb ${ETH_DEPENDENCY_INSTALL_DIR}/include/ && cp libleveldb.a ${ETH_DEPENDENCY_INSTALL_DIR}/lib && cp libleveldb.dylib.1.15 ${ETH_DEPENDENCY_INSTALL_DIR}/lib/libleveldb.dylib
) )

0
extdep/leveldb_osx.patch → extdep/compile/leveldb_osx.patch

6
extdep/qt.cmake → extdep/compile/qt.cmake

@ -2,7 +2,7 @@ if(APPLE)
ExternalProject_add(qt ExternalProject_add(qt
URL http://qtmirror.ics.com/pub/qtproject/official_releases/qt/5.3/5.3.2/single/qt-everywhere-opensource-src-5.3.2.tar.gz URL http://qtmirror.ics.com/pub/qtproject/official_releases/qt/5.3/5.3.2/single/qt-everywhere-opensource-src-5.3.2.tar.gz
BINARY_DIR qt-prefix/src/qt BINARY_DIR qt-prefix/src/qt
PATCH_COMMAND patch -d qtmultimedia/src/plugins/avfoundation/mediaplayer < ${CMAKE_CURRENT_SOURCE_DIR}/qt_osx.patch PATCH_COMMAND patch -d qtmultimedia/src/plugins/avfoundation/mediaplayer < ${CMAKE_CURRENT_SOURCE_DIR}/compile/qt_osx.patch
CONFIGURE_COMMAND ./configure -prefix ${ETH_DEPENDENCY_INSTALL_DIR} -system-zlib -qt-libpng -qt-libjpeg -confirm-license -opensource -nomake tests -release -nomake examples -no-xcb -arch x86_64 CONFIGURE_COMMAND ./configure -prefix ${ETH_DEPENDENCY_INSTALL_DIR} -system-zlib -qt-libpng -qt-libjpeg -confirm-license -opensource -nomake tests -release -nomake examples -no-xcb -arch x86_64
BUILD_COMMAND make BUILD_COMMAND make
INSTALL_COMMAND make install INSTALL_COMMAND make install
@ -12,8 +12,8 @@ ExternalProject_Add(qt
DEPENDS icu jom DEPENDS icu jom
URL http://download.qt-project.org/official_releases/qt/5.2/5.2.1/single/qt-everywhere-opensource-src-5.2.1.tar.gz URL http://download.qt-project.org/official_releases/qt/5.2/5.2.1/single/qt-everywhere-opensource-src-5.2.1.tar.gz
BINARY_DIR qt-prefix/src/qt BINARY_DIR qt-prefix/src/qt
UPDATE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/tools.bat UPDATE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/compile/qt_tools.bat
PATCH_COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/configure.bat qtbase PATCH_COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/compile/qt_configure.bat qtbase/configure.bat
CONFIGURE_COMMAND configure -prefix ${ETH_DEPENDENCY_INSTALL_DIR} -opensource -confirm-license -release -opengl desktop -platform win32-msvc2013 -icu -I ${ETH_DEPENDENCY_INSTALL_DIR}/include -L ${ETH_DEPENDENCY_INSTALL_DIR}/lib -nomake tests -nomake examples CONFIGURE_COMMAND configure -prefix ${ETH_DEPENDENCY_INSTALL_DIR} -opensource -confirm-license -release -opengl desktop -platform win32-msvc2013 -icu -I ${ETH_DEPENDENCY_INSTALL_DIR}/include -L ${ETH_DEPENDENCY_INSTALL_DIR}/lib -nomake tests -nomake examples
BUILD_COMMAND nmake BUILD_COMMAND nmake

0
extdep/configure.bat → extdep/compile/qt_configure.bat

0
extdep/qt_osx.patch → extdep/compile/qt_osx.patch

0
extdep/tools.bat → extdep/compile/qt_tools.bat

0
extdep/snappy.cmake → extdep/compile/snappy.cmake

8
extdep/precompiled/json-rpc-cpp.cmake

@ -0,0 +1,8 @@
ExternalProject_Add(json-rpc-cpp
URL ${ETH_DEPENDENCY_SERVER}/json-rpc-cpp.tar.gz
BINARY_DIR json-rpc-cpp-prefix/src/json-rpc-cpp
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
INSTALL_COMMAND cmake -E copy_directory . ${ETH_DEPENDENCY_INSTALL_DIR}
)
Loading…
Cancel
Save