mirror of
				https://github.com/OpenMW/openmw.git
				synced 2025-11-04 11:26:42 +00:00 
			
		
		
		
	Merge branch 'boostsystemfix' into 'master'
Don't link to stub Boost.System library (#8754) Closes #8754 See merge request OpenMW/openmw!4964
This commit is contained in:
		
						commit
						f372dc1006
					
				
					 2 changed files with 1 additions and 2 deletions
				
			
		| 
						 | 
					@ -452,7 +452,7 @@ if(HAVE_MULTIVIEW)
 | 
				
			||||||
    add_definitions(-DOSG_HAS_MULTIVIEW)
 | 
					    add_definitions(-DOSG_HAS_MULTIVIEW)
 | 
				
			||||||
endif(HAVE_MULTIVIEW)
 | 
					endif(HAVE_MULTIVIEW)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
set(BOOST_COMPONENTS iostreams program_options system)
 | 
					set(BOOST_COMPONENTS iostreams program_options)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
find_package(Boost 1.70.0 CONFIG REQUIRED COMPONENTS ${BOOST_COMPONENTS} OPTIONAL_COMPONENTS ${BOOST_OPTIONAL_COMPONENTS})
 | 
					find_package(Boost 1.70.0 CONFIG REQUIRED COMPONENTS ${BOOST_COMPONENTS} OPTIONAL_COMPONENTS ${BOOST_OPTIONAL_COMPONENTS})
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -592,7 +592,6 @@ target_link_libraries(components
 | 
				
			||||||
    ${OSG_LIBRARIES}
 | 
					    ${OSG_LIBRARIES}
 | 
				
			||||||
    ${OPENTHREADS_LIBRARIES}
 | 
					    ${OPENTHREADS_LIBRARIES}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    Boost::system
 | 
					 | 
				
			||||||
    Boost::program_options
 | 
					    Boost::program_options
 | 
				
			||||||
    Boost::iostreams
 | 
					    Boost::iostreams
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue