mirror of
				https://github.com/SoftFever/OrcaSlicer.git
				synced 2025-11-02 20:51:23 -07:00 
			
		
		
		
	Add NLopt the new way to dependencies
This commit is contained in:
		
							parent
							
								
									ca67d880ec
								
							
						
					
					
						commit
						69139c2a6f
					
				
					 4 changed files with 18 additions and 36 deletions
				
			
		
							
								
								
									
										4
									
								
								deps/CMakeLists.txt
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								deps/CMakeLists.txt
									
										
									
									
										vendored
									
									
								
							| 
						 | 
				
			
			@ -79,6 +79,7 @@ function(prusaslicer_add_cmake_project projectname)
 | 
			
		|||
            -DCMAKE_DEBUG_POSTFIX:STRING=d
 | 
			
		||||
            -DCMAKE_C_COMPILER:STRING=${CMAKE_C_COMPILER}
 | 
			
		||||
            -DCMAKE_CXX_COMPILER:STRING=${CMAKE_CXX_COMPILER}
 | 
			
		||||
            -DCMAKE_TOOLCHAIN_FILE:STRING=${CMAKE_TOOLCHAIN_FILE}
 | 
			
		||||
            -DBUILD_SHARED_LIBS:BOOL=OFF
 | 
			
		||||
            "${_configs_line}"
 | 
			
		||||
            ${DEP_CMAKE_OPTS}
 | 
			
		||||
| 
						 | 
				
			
			@ -150,6 +151,7 @@ include(OpenCSG/OpenCSG.cmake)
 | 
			
		|||
include(GMP/GMP.cmake)
 | 
			
		||||
include(MPFR/MPFR.cmake)
 | 
			
		||||
include(CGAL/CGAL.cmake)
 | 
			
		||||
include(NLopt/NLopt.cmake)
 | 
			
		||||
include(wxWidgets/wxWidgets.cmake)
 | 
			
		||||
 | 
			
		||||
if (NOT "${ZLIB_PKG}" STREQUAL "")
 | 
			
		||||
| 
						 | 
				
			
			@ -164,7 +166,7 @@ set(_dep_list
 | 
			
		|||
    dep_wxWidgets
 | 
			
		||||
    dep_gtest
 | 
			
		||||
    dep_cereal
 | 
			
		||||
    dep_nlopt
 | 
			
		||||
    dep_NLopt
 | 
			
		||||
    dep_openvdb
 | 
			
		||||
    dep_OpenCSG
 | 
			
		||||
    dep_CGAL
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										15
									
								
								deps/NLopt/NLopt.cmake
									
										
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										15
									
								
								deps/NLopt/NLopt.cmake
									
										
									
									
										vendored
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,15 @@
 | 
			
		|||
prusaslicer_add_cmake_project(NLopt
 | 
			
		||||
  URL "https://github.com/stevengj/nlopt/archive/v2.5.0.tar.gz"
 | 
			
		||||
  URL_HASH SHA256=c6dd7a5701fff8ad5ebb45a3dc8e757e61d52658de3918e38bab233e7fd3b4ae
 | 
			
		||||
  CMAKE_ARGS
 | 
			
		||||
    -DNLOPT_PYTHON:BOOL=OFF
 | 
			
		||||
    -DNLOPT_OCTAVE:BOOL=OFF
 | 
			
		||||
    -DNLOPT_MATLAB:BOOL=OFF
 | 
			
		||||
    -DNLOPT_GUILE:BOOL=OFF
 | 
			
		||||
    -DNLOPT_SWIG:BOOL=OFF
 | 
			
		||||
    -DNLOPT_TESTS:BOOL=OFF
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
if (MSVC)
 | 
			
		||||
    add_debug_dep(dep_NLopt)
 | 
			
		||||
endif ()
 | 
			
		||||
							
								
								
									
										14
									
								
								deps/deps-unix-common.cmake
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										14
									
								
								deps/deps-unix-common.cmake
									
										
									
									
										vendored
									
									
								
							| 
						 | 
				
			
			@ -47,20 +47,6 @@ ExternalProject_Add(dep_cereal
 | 
			
		|||
        ${DEP_CMAKE_OPTS}
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
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_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}
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
ExternalProject_Add(dep_qhull
 | 
			
		||||
    EXCLUDE_FROM_ALL 1
 | 
			
		||||
    #URL "https://github.com/qhull/qhull/archive/v7.3.2.tar.gz"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										21
									
								
								deps/deps-windows.cmake
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										21
									
								
								deps/deps-windows.cmake
									
										
									
									
										vendored
									
									
								
							| 
						 | 
				
			
			@ -128,27 +128,6 @@ ExternalProject_Add(dep_cereal
 | 
			
		|||
    INSTALL_COMMAND ""
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
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_GENERATOR_PLATFORM "${DEP_PLATFORM}"
 | 
			
		||||
    CMAKE_ARGS
 | 
			
		||||
        -DBUILD_SHARED_LIBS=OFF
 | 
			
		||||
        -DNLOPT_PYTHON=OFF
 | 
			
		||||
        -DNLOPT_OCTAVE=OFF
 | 
			
		||||
        -DNLOPT_MATLAB=OFF
 | 
			
		||||
        -DNLOPT_GUILE=OFF
 | 
			
		||||
        -DCMAKE_POSITION_INDEPENDENT_CODE=ON
 | 
			
		||||
        -DCMAKE_DEBUG_POSTFIX=d
 | 
			
		||||
        "-DCMAKE_INSTALL_PREFIX:PATH=${DESTDIR}\\usr\\local"
 | 
			
		||||
    BUILD_COMMAND msbuild /m /P:Configuration=Release INSTALL.vcxproj
 | 
			
		||||
    INSTALL_COMMAND ""
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
add_debug_dep(dep_nlopt)
 | 
			
		||||
 | 
			
		||||
if (${DEPS_BITS} EQUAL 32)
 | 
			
		||||
    set(DEP_LIBCURL_TARGET "x86")
 | 
			
		||||
else ()
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue