mirror of
				https://github.com/ethereum/solidity
				synced 2023-10-03 13:03:40 +00:00 
			
		
		
		
	Merge pull request #418 from chriseth/dependencyCleanup
CMakeLists library dependency cleanup
This commit is contained in:
		
						commit
						95c973cc12
					
				| @ -16,33 +16,8 @@ file(GLOB HEADERS "*.h") | |||||||
| 
 | 
 | ||||||
| include_directories(..) | include_directories(..) | ||||||
| 
 | 
 | ||||||
| target_link_libraries(${EXECUTABLE} evmface) |  | ||||||
| target_link_libraries(${EXECUTABLE} devcore) | target_link_libraries(${EXECUTABLE} devcore) | ||||||
| 
 | target_link_libraries(${EXECUTABLE} evmface) | ||||||
| 
 |  | ||||||
| if("${TARGET_PLATFORM}" STREQUAL "w64") |  | ||||||
| 	target_link_libraries(${EXECUTABLE} boost_system-mt-s) |  | ||||||
| 	target_link_libraries(${EXECUTABLE} boost_thread_win32-mt-s) |  | ||||||
| 	target_link_libraries(${EXECUTABLE} iphlpapi) |  | ||||||
| 	target_link_libraries(${EXECUTABLE} ws2_32) |  | ||||||
| 	target_link_libraries(${EXECUTABLE} mswsock) |  | ||||||
| 	target_link_libraries(${EXECUTABLE} shlwapi) |  | ||||||
| elseif (APPLE) |  | ||||||
| 	# Latest mavericks boost libraries only come with -mt |  | ||||||
| 	target_link_libraries(${EXECUTABLE} boost_system-mt) |  | ||||||
| 	target_link_libraries(${EXECUTABLE} boost_thread-mt) |  | ||||||
| 	find_package(Threads REQUIRED) |  | ||||||
| 	target_link_libraries(${EXECUTABLE} ${CMAKE_THREAD_LIBS_INIT}) |  | ||||||
| elseif (UNIX) |  | ||||||
| 	target_link_libraries(${EXECUTABLE} ${Boost_SYSTEM_LIBRARY}) |  | ||||||
| 	target_link_libraries(${EXECUTABLE} ${Boost_THREAD_LIBRARY}) |  | ||||||
| 	target_link_libraries(${EXECUTABLE} ${CMAKE_THREAD_LIBS_INIT}) |  | ||||||
| else () |  | ||||||
| 	target_link_libraries(${EXECUTABLE} boost_system) |  | ||||||
| 	target_link_libraries(${EXECUTABLE} boost_thread) |  | ||||||
| 	find_package(Threads REQUIRED) |  | ||||||
| 	target_link_libraries(${EXECUTABLE} ${CMAKE_THREAD_LIBS_INIT}) |  | ||||||
| endif () |  | ||||||
| 
 | 
 | ||||||
| install( TARGETS ${EXECUTABLE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib ) | install( TARGETS ${EXECUTABLE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib ) | ||||||
| install( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} ) | install( FILES ${HEADERS} DESTINATION include/${EXECUTABLE} ) | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user