diff options
| author | tamasmeszaros <meszaros.q@gmail.com> | 2019-03-19 17:02:50 +0300 |
|---|---|---|
| committer | Vojtech Kral <vojtech@kral.hk> | 2019-03-25 13:41:16 +0300 |
| commit | e927c65c0aba8f4bb7eb7e45c6cf5d60b2a48b41 (patch) | |
| tree | 23b7c02ddde8c868af03cc9158dda1b2284b7de7 /deps | |
| parent | 6c7120a291c2666ab82d78510af47980b0a8b656 (diff) | |
Some fixes for dependency targets on Linux
Diffstat (limited to 'deps')
| -rw-r--r-- | deps/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | deps/deps-linux.cmake | 24 | ||||
| -rw-r--r-- | deps/deps-unix-common.cmake | 13 |
3 files changed, 19 insertions, 19 deletions
diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index 1e025adac..421177dbf 100644 --- a/deps/CMakeLists.txt +++ b/deps/CMakeLists.txt @@ -32,6 +32,7 @@ if (NPROC EQUAL 0) endif () set(DESTDIR "${CMAKE_CURRENT_BINARY_DIR}/destdir" CACHE PATH "Destination directory") + option(DEP_DEBUG "Build debug variants (only applicable on Windows)" ON) option(DEP_WX_STABLE "Build against wxWidgets stable 3.0 as opposed to default 3.1 (Linux only)" OFF) diff --git a/deps/deps-linux.cmake b/deps/deps-linux.cmake index 125553f77..9532ee2f4 100644 --- a/deps/deps-linux.cmake +++ b/deps/deps-linux.cmake @@ -3,7 +3,6 @@ set(DEP_CMAKE_OPTS "-DCMAKE_POSITION_INDEPENDENT_CODE=ON") include("deps-unix-common.cmake") - ExternalProject_Add(dep_boost EXCLUDE_FROM_ALL 1 URL "https://dl.bintray.com/boostorg/release/1.66.0/source/boost_1_66_0.tar.gz" @@ -25,18 +24,17 @@ ExternalProject_Add(dep_boost INSTALL_COMMAND "" # b2 does that already ) -ExternalProject_Add(dep_libpng - EXCLUDE_FROM_ALL 1 - URL "https://github.com/glennrp/libpng/archive/v1.6.36.tar.gz" - URL_HASH SHA256=5bef5a850a9255365a2dc344671b7e9ef810de491bd479c2506ac3c337e2d84f - CMAKE_GENERATOR "${DEP_MSVC_GEN}" - CMAKE_ARGS - -DPNG_SHARED=OFF - -DPNG_TESTS=OFF - ${DEP_CMAKE_OPTS} - INSTALL_COMMAND make install "DESTDIR=${DESTDIR}" - INSTALL_COMMAND "" -) +# ExternalProject_Add(dep_libpng +# EXCLUDE_FROM_ALL 1 +# URL "https://github.com/glennrp/libpng/archive/v1.6.36.tar.gz" +# URL_HASH SHA256=5bef5a850a9255365a2dc344671b7e9ef810de491bd479c2506ac3c337e2d84f +# CMAKE_ARGS +# -DPNG_SHARED=OFF +# -DPNG_TESTS=OFF +# -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr/local +# ${DEP_CMAKE_OPTS} +# # INSTALL_COMMAND make install "DESTDIR=${DESTDIR}" +# ) ExternalProject_Add(dep_libopenssl EXCLUDE_FROM_ALL 1 diff --git a/deps/deps-unix-common.cmake b/deps/deps-unix-common.cmake index 6c0a1b182..5be4f8992 100644 --- a/deps/deps-unix-common.cmake +++ b/deps/deps-unix-common.cmake @@ -8,30 +8,31 @@ ExternalProject_Add(dep_tbb CMAKE_ARGS -DTBB_BUILD_SHARED=OFF -DTBB_BUILD_TESTS=OFF + -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr/local ${DEP_CMAKE_OPTS} - INSTALL_COMMAND make install "DESTDIR=${DESTDIR}" + # INSTALL_COMMAND make install "DESTDIR=${DESTDIR}" ) ExternalProject_Add(dep_gtest EXCLUDE_FROM_ALL 1 URL "https://github.com/google/googletest/archive/release-1.8.1.tar.gz" URL_HASH SHA256=9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c - CMAKE_ARGS -DBUILD_GMOCK=OFF ${DEP_CMAKE_OPTS} - INSTALL_COMMAND make install "DESTDIR=${DESTDIR}" + CMAKE_ARGS -DBUILD_GMOCK=OFF ${DEP_CMAKE_OPTS} -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr/local + # INSTALL_COMMAND make install "DESTDIR=${DESTDIR}" ) ExternalProject_Add(dep_nlopt EXCLUDE_FROM_ALL 1 URL "https://github.com/stevengj/nlopt/archive/v2.5.0.tar.gz" URL_HASH SHA256=c6dd7a5701fff8ad5ebb45a3dc8e757e61d52658de3918e38bab233e7fd3b4ae - CMAKE_GENERATOR "${DEP_MSVC_GEN}" CMAKE_ARGS -DBUILD_SHARED_LIBS=OFF -DNLOPT_PYTHON=OFF -DNLOPT_OCTAVE=OFF -DNLOPT_MATLAB=OFF -DNLOPT_GUILE=OFF + -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr/local ${DEP_CMAKE_OPTS} - INSTALL_COMMAND make install "DESTDIR=${DESTDIR}" - INSTALL_COMMAND "" + # INSTALL_COMMAND make install "DESTDIR=${DESTDIR}" + # INSTALL_COMMAND "" ) |