Fixes in CMake for building snapshots
This commit is contained in:
		
							parent
							
								
									f6fb785cea
								
							
						
					
					
						commit
						aa924dc348
					
				|  | @ -2,7 +2,6 @@ cmake_minimum_required(VERSION 2.6) | ||||||
| project(otclient) | project(otclient) | ||||||
| 
 | 
 | ||||||
| set(VERSION "0.6.6") | set(VERSION "0.6.6") | ||||||
| set(LIB_NAME "otc_framework") |  | ||||||
| 
 | 
 | ||||||
| option(FRAMEWORK_SOUND "Use SOUND " ON) | option(FRAMEWORK_SOUND "Use SOUND " ON) | ||||||
| option(FRAMEWORK_GRAPHICS "Use GRAPHICS " ON) | option(FRAMEWORK_GRAPHICS "Use GRAPHICS " ON) | ||||||
|  | @ -36,20 +35,9 @@ endif() | ||||||
| 
 | 
 | ||||||
| add_definitions(-D"VERSION=\\"${VERSION}\\"") | add_definitions(-D"VERSION=\\"${VERSION}\\"") | ||||||
| 
 | 
 | ||||||
| # we want framework to be a library for faster compilation/linking |  | ||||||
| if(USE_STATIC_LIBS) |  | ||||||
|     add_library(${LIB_NAME} ${framework_SOURCES}) |  | ||||||
| else() |  | ||||||
|     add_library(${LIB_NAME} SHARED ${framework_SOURCES}) |  | ||||||
|     message(STATUS "Linking to shared ${LIB_NAME}, make sure you copy the DLL/SO/dylib with the executable!") |  | ||||||
| endif() |  | ||||||
| target_link_libraries(${LIB_NAME} ${framework_LIBRARIES}) |  | ||||||
| 
 |  | ||||||
| # add client executable | # add client executable | ||||||
| add_executable(${PROJECT_NAME} ${client_SOURCES} ${executable_SOURCES}) | add_executable(${PROJECT_NAME} ${framework_SOURCES} ${client_SOURCES} ${executable_SOURCES}) | ||||||
| 
 | target_link_libraries(${PROJECT_NAME} ${framework_LIBRARIES}) | ||||||
| # target link libraries |  | ||||||
| target_link_libraries(${PROJECT_NAME} ${LIB_NAME}) |  | ||||||
| 
 | 
 | ||||||
| if(USE_PCH) | if(USE_PCH) | ||||||
|     include(cotire) |     include(cotire) | ||||||
|  | @ -61,7 +49,7 @@ endif() | ||||||
| 
 | 
 | ||||||
| # installation | # installation | ||||||
| set(DATA_INSTALL_DIR share/${PROJECT_NAME}) | set(DATA_INSTALL_DIR share/${PROJECT_NAME}) | ||||||
| install(TARGETS ${PROJECT_NAME} ${LIB_NAME} | install(TARGETS ${PROJECT_NAME} | ||||||
| 		RUNTIME DESTINATION bin | 		RUNTIME DESTINATION bin | ||||||
| 		LIBRARY DESTINATION lib | 		LIBRARY DESTINATION lib | ||||||
| 		ARCHIVE DESTINATION lib) | 		ARCHIVE DESTINATION lib) | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue
	
	 Eduardo Bart
						Eduardo Bart