3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some fixes for dependency targets on Linux

Browse Source
This commit is contained in:
tamasmeszaros 2019-03-19 15:02:50 +01:00 committed by Vojtech Kral
parent 6c7120a291
commit e927c65c0a
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
deps/CMakeLists.txt vendored
View File

@ -32,6 +32,7 @@ if (NPROC EQUAL 0)
endif () endif ()
set(DESTDIR "${CMAKE_CURRENT_BINARY_DIR}/destdir" CACHE PATH "Destination directory") set(DESTDIR "${CMAKE_CURRENT_BINARY_DIR}/destdir" CACHE PATH "Destination directory")
option(DEP_DEBUG "Build debug variants (only applicable on Windows)" ON) 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) option(DEP_WX_STABLE "Build against wxWidgets stable 3.0 as opposed to default 3.1 (Linux only)" OFF)

24
deps/deps-linux.cmake vendored
View File

@ -3,7 +3,6 @@ set(DEP_CMAKE_OPTS "-DCMAKE_POSITION_INDEPENDENT_CODE=ON")
include("deps-unix-common.cmake") include("deps-unix-common.cmake")
ExternalProject_Add(dep_boost ExternalProject_Add(dep_boost
EXCLUDE_FROM_ALL 1 EXCLUDE_FROM_ALL 1
URL "https://dl.bintray.com/boostorg/release/1.66.0/source/boost_1_66_0.tar.gz" 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 INSTALL_COMMAND "" # b2 does that already
) )
ExternalProject_Add(dep_libpng # ExternalProject_Add(dep_libpng
EXCLUDE_FROM_ALL 1 # EXCLUDE_FROM_ALL 1
URL "https://github.com/glennrp/libpng/archive/v1.6.36.tar.gz" # URL "https://github.com/glennrp/libpng/archive/v1.6.36.tar.gz"
URL_HASH SHA256=5bef5a850a9255365a2dc344671b7e9ef810de491bd479c2506ac3c337e2d84f # URL_HASH SHA256=5bef5a850a9255365a2dc344671b7e9ef810de491bd479c2506ac3c337e2d84f
CMAKE_GENERATOR "${DEP_MSVC_GEN}" # CMAKE_ARGS
CMAKE_ARGS # -DPNG_SHARED=OFF
-DPNG_SHARED=OFF # -DPNG_TESTS=OFF
-DPNG_TESTS=OFF # -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr/local
${DEP_CMAKE_OPTS} # ${DEP_CMAKE_OPTS}
INSTALL_COMMAND make install "DESTDIR=${DESTDIR}" # # INSTALL_COMMAND make install "DESTDIR=${DESTDIR}"
INSTALL_COMMAND "" # )
)
ExternalProject_Add(dep_libopenssl ExternalProject_Add(dep_libopenssl
EXCLUDE_FROM_ALL 1 EXCLUDE_FROM_ALL 1

13
deps/deps-unix-common.cmake vendored
View File

@ -8,30 +8,31 @@ ExternalProject_Add(dep_tbb
CMAKE_ARGS CMAKE_ARGS
-DTBB_BUILD_SHARED=OFF -DTBB_BUILD_SHARED=OFF
-DTBB_BUILD_TESTS=OFF -DTBB_BUILD_TESTS=OFF
-DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr/local
${DEP_CMAKE_OPTS} ${DEP_CMAKE_OPTS}
INSTALL_COMMAND make install "DESTDIR=${DESTDIR}" # INSTALL_COMMAND make install "DESTDIR=${DESTDIR}"
) )
ExternalProject_Add(dep_gtest ExternalProject_Add(dep_gtest
EXCLUDE_FROM_ALL 1 EXCLUDE_FROM_ALL 1
URL "https://github.com/google/googletest/archive/release-1.8.1.tar.gz" URL "https://github.com/google/googletest/archive/release-1.8.1.tar.gz"
URL_HASH SHA256=9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c URL_HASH SHA256=9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c
CMAKE_ARGS -DBUILD_GMOCK=OFF ${DEP_CMAKE_OPTS} CMAKE_ARGS -DBUILD_GMOCK=OFF ${DEP_CMAKE_OPTS} -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr/local
INSTALL_COMMAND make install "DESTDIR=${DESTDIR}" # INSTALL_COMMAND make install "DESTDIR=${DESTDIR}"
) )
ExternalProject_Add(dep_nlopt ExternalProject_Add(dep_nlopt
EXCLUDE_FROM_ALL 1 EXCLUDE_FROM_ALL 1
URL "https://github.com/stevengj/nlopt/archive/v2.5.0.tar.gz" URL "https://github.com/stevengj/nlopt/archive/v2.5.0.tar.gz"
URL_HASH SHA256=c6dd7a5701fff8ad5ebb45a3dc8e757e61d52658de3918e38bab233e7fd3b4ae URL_HASH SHA256=c6dd7a5701fff8ad5ebb45a3dc8e757e61d52658de3918e38bab233e7fd3b4ae
CMAKE_GENERATOR "${DEP_MSVC_GEN}"
CMAKE_ARGS CMAKE_ARGS
-DBUILD_SHARED_LIBS=OFF -DBUILD_SHARED_LIBS=OFF
-DNLOPT_PYTHON=OFF -DNLOPT_PYTHON=OFF
-DNLOPT_OCTAVE=OFF -DNLOPT_OCTAVE=OFF
-DNLOPT_MATLAB=OFF -DNLOPT_MATLAB=OFF
-DNLOPT_GUILE=OFF -DNLOPT_GUILE=OFF
-DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr/local
${DEP_CMAKE_OPTS} ${DEP_CMAKE_OPTS}
INSTALL_COMMAND make install "DESTDIR=${DESTDIR}" # INSTALL_COMMAND make install "DESTDIR=${DESTDIR}"
INSTALL_COMMAND "" # INSTALL_COMMAND ""
) )