mirror of
				https://github.com/DarkflameUniverse/DarkflameServer.git
				synced 2025-10-31 20:52:01 +00:00 
			
		
		
		
	 554a9a6806
			
		
	
	554a9a6806
	
	
	
		
			
			* fix: more include changes * fix: remove dZoneManager from global include * fix: dDatabase * fix: dCommon * fix: object libs * fix: rebase * fix: bcrypt * wip: try simplified connector build * fix: update dockerfile * fix: mariadb C/C++ on apple * feat: Move scripts to CMAKE_MODULE_PATH * fix: dPropertyBehaviors * fix: macos? * fix: Dockerfile * fix: macos? * fix: macos? * fix: macos? * fix: macos? * fix: macos? * try: install_name_tool * fix not building on unix * fix include paths * Remove code changes Will fix in another PR. * format pass remove 2 more included directories. remove commented out code add status to messages * comments and format surround include directories with quotes remove commented out code remove debug messages * Update CMakeLists.txt --------- Co-authored-by: David Markowitz <EmosewaMC@gmail.com> Co-authored-by: David Markowitz <39972741+EmosewaMC@users.noreply.github.com>
		
			
				
	
	
		
			33 lines
		
	
	
		
			870 B
		
	
	
	
		
			CMake
		
	
	
	
	
	
			
		
		
	
	
			33 lines
		
	
	
		
			870 B
		
	
	
	
		
			CMake
		
	
	
	
	
	
| set(DDATABASE_GAMEDATABASE_SOURCES
 | |
| 	"Database.cpp"
 | |
| )
 | |
| 
 | |
| add_subdirectory(MySQL)
 | |
| 
 | |
| foreach(file ${DDATABSE_DATABSES_MYSQL_SOURCES})
 | |
| 	set(DDATABASE_GAMEDATABASE_SOURCES ${DDATABASE_GAMEDATABASE_SOURCES} "MySQL/${file}")
 | |
| endforeach()
 | |
| 
 | |
| add_library(dDatabaseGame STATIC ${DDATABASE_GAMEDATABASE_SOURCES})
 | |
| target_include_directories(dDatabaseGame PUBLIC "."
 | |
| 	"ITables" PRIVATE "MySQL"
 | |
| 	"${PROJECT_SOURCE_DIR}/dCommon"
 | |
| 	"${PROJECT_SOURCE_DIR}/dCommon/dEnums"
 | |
| )
 | |
| target_link_libraries(dDatabaseGame
 | |
| 	PUBLIC MariaDB::ConnCpp
 | |
| 	INTERFACE dCommon)
 | |
| 
 | |
| # Glob together all headers that need to be precompiled
 | |
| file(
 | |
| 	GLOB HEADERS_DDATABASE_GAME
 | |
| 	LIST_DIRECTORIES false
 | |
| 	ITables/*.h
 | |
| )
 | |
| 
 | |
| # Need to specify to use the CXX compiler language here or else we get errors including <string>.
 | |
| target_precompile_headers(
 | |
| 	dDatabaseGame PRIVATE
 | |
| 	"$<$<COMPILE_LANGUAGE:CXX>:${HEADERS_DDATABASE_GAME}>"
 | |
| )
 |