mirror of
				https://github.com/DarkflameUniverse/DarkflameServer.git
				synced 2025-11-03 22:21:59 +00:00 
			
		
		
		
	Revert "more fiddling with mac test builds"
This reverts commit 0f843c02c9.
			
			
This commit is contained in:
		@@ -4,7 +4,7 @@ enable_testing()
 | 
				
			|||||||
find_package(GoogleTest REQUIRED)
 | 
					find_package(GoogleTest REQUIRED)
 | 
				
			||||||
include(GoogleTest)
 | 
					include(GoogleTest)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin)
 | 
					set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#if(APPLE)
 | 
					#if(APPLE)
 | 
				
			||||||
#	set(CMAKE_INSTALL_RPATH_USE_LINK_PATH True)
 | 
					#	set(CMAKE_INSTALL_RPATH_USE_LINK_PATH True)
 | 
				
			||||||
@@ -13,7 +13,7 @@ include(GoogleTest)
 | 
				
			|||||||
#endif()
 | 
					#endif()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
add_custom_target(conncpp_tests
 | 
					add_custom_target(conncpp_tests
 | 
				
			||||||
	${CMAKE_COMMAND} -E copy $<TARGET_FILE:MariaDB::ConnCpp> ${CMAKE_CURRENT_BINARY_DIR}) # ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
 | 
						${CMAKE_COMMAND} -E copy $<TARGET_FILE:MariaDB::ConnCpp> ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Add the subdirectories
 | 
					# Add the subdirectories
 | 
				
			||||||
add_subdirectory(dCommonTests)
 | 
					add_subdirectory(dCommonTests)
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user