Attachment #142350 for bug #132055

Lines 16-22 Link Here

(-)CMakeLists.txt (-1 / +7 lines)
16	add_definitions(-DHAVE_INTTYPES_H=1)	16	add_definitions(-DHAVE_INTTYPES_H=1)
17	endif(INTTYPES_INCLUDE_DIR)	17	endif(INTTYPES_INCLUDE_DIR)
18		18
19	set(DATADIR share/vavoom)	19	IF(NOT DEFINED DATADIR)
		20	set(DATADIR share/vavoom)
		21	ENDIF(NOT DEFINED DATADIR)
		22
		23	IF(NOT DEFINED BINDIR)
		24	set(BINDIR bin)
		25	ENDIF(NOT DEFINED BINDIR)
20		26
21	add_subdirectory(utils)	27	add_subdirectory(utils)
22	add_subdirectory(source)	28	add_subdirectory(source)





add_executable(vavoom ${MAIN_SOURCES})
if(UNIX)
set_target_properties(vavoom PROPERTIES OUTPUT_NAME ../vavoom.i686)
else(UNIX)
set_target_properties(vavoom PROPERTIES OUTPUT_NAME ../vavoom)
endif(UNIX)
if (MAIN_COMPILE_FLAGS)

target_link_libraries(vavoom ${MAIN_LIBS})
add_dependencies(vavoom timidity glbsp libglvis)

install(TARGETS vavoom DESTINATION ${BINDIR})

install(FILES vavoom.png DESTINATION ${DATADIR})

if(UNIX)
	file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/vavoom
"#!/bin/sh
# Needed to make symlinks/shortcuts work.
# the binaries must run with correct working directory
cd \"${CMAKE_INSTALL_PREFIX}/${DATADIR}\"
\"${CMAKE_INSTALL_PREFIX}/bin/vavoom.i686\" $* ${IWADDIR}
exit $?
")
	install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/vavoom DESTINATION bin)
endif(UNIX)

endif(ENABLE_CLIENT)



add_executable(vavoom-dedicated ${SERVER_SOURCES})
if(UNIX)
set_target_properties(vavoom-dedicated PROPERTIES OUTPUT_NAME ../vavoom-ded)
else(UNIX)
set_target_properties(vavoom-dedicated PROPERTIES OUTPUT_NAME ../vavoom-dedicated)
endif(UNIX)
set_target_properties(vavoom-dedicated PROPERTIES COMPILE_FLAGS -DSERVER)
target_link_libraries(vavoom-dedicated glbsp ${ZLIB_LIBRARY} ${NET_LIBRARIES})
add_dependencies(vavoom-dedicated glbsp)

install(TARGETS vavoom-dedicated DESTINATION ${BINDIR})

if(UNIX)
	file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/vavoom-dedicated
"#!/bin/sh
# Needed to make symlinks/shortcuts work.
# the binaries must run with correct working directory
cd \"${CMAKE_INSTALL_PREFIX}/${DATADIR}\"
\"${CMAKE_INSTALL_PREFIX}/bin/vavoom-dedicated.i686\" $* ${IWADDIR}
exit $?
")
	install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/vavoom-dedicated DESTINATION bin)
endif(UNIX)

endif(ENABLE_SERVER)


Lines 9-15 Link Here

(-)utils/vlaunch/CMakeLists.txt (-1 / +1 lines)
9	)	9	)
10	target_link_libraries(vlaunch ${wxWidgets_LIBRARIES})	10	target_link_libraries(vlaunch ${wxWidgets_LIBRARIES})
11		11
12	install(TARGETS vlaunch DESTINATION bin)	12	install(TARGETS vlaunch DESTINATION ${BINDIR})
13		13
14	#EXTRA_DIST = \	14	#EXTRA_DIST = \
15	# vavoom.xpm \	15	# vavoom.xpm \

Return to bug 132055

Lines 845-852 Link Here

(-)source/CMakeLists.txt (-33 / +3 lines)
845		845
846	add_executable(vavoom ${MAIN_SOURCES})	846	add_executable(vavoom ${MAIN_SOURCES})
847	if(UNIX)	847	if(UNIX)
848	set_target_properties(vavoom PROPERTIES OUTPUT_NAME ../vavoom.i686)
849	else(UNIX)
850	set_target_properties(vavoom PROPERTIES OUTPUT_NAME ../vavoom)	848	set_target_properties(vavoom PROPERTIES OUTPUT_NAME ../vavoom)
851	endif(UNIX)	849	endif(UNIX)
852	if (MAIN_COMPILE_FLAGS)	850	if (MAIN_COMPILE_FLAGS)
Lines 855-875 Link Here
855	target_link_libraries(vavoom ${MAIN_LIBS})	853	target_link_libraries(vavoom ${MAIN_LIBS})
856	add_dependencies(vavoom timidity glbsp libglvis)	854	add_dependencies(vavoom timidity glbsp libglvis)
857		855
858	install(TARGETS vavoom DESTINATION bin)	856	install(TARGETS vavoom DESTINATION ${BINDIR})
859
860	install(FILES vavoom.png DESTINATION ${DATADIR})
861
862	if(UNIX)
863	file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/vavoom
864	"#!/bin/sh
865	# Needed to make symlinks/shortcuts work.
866	# the binaries must run with correct working directory
867	cd \"${CMAKE_INSTALL_PREFIX}/${DATADIR}\"
868	\"${CMAKE_INSTALL_PREFIX}/bin/vavoom.i686\" $* ${IWADDIR}
869	exit $?
870	")
871	install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/vavoom DESTINATION bin)
872	endif(UNIX)
873		857
874	endif(ENABLE_CLIENT)	858	endif(ENABLE_CLIENT)
875		859
Lines 889-915 Link Here
889		873
890	add_executable(vavoom-dedicated ${SERVER_SOURCES})	874	add_executable(vavoom-dedicated ${SERVER_SOURCES})
891	if(UNIX)	875	if(UNIX)
892	set_target_properties(vavoom-dedicated PROPERTIES OUTPUT_NAME ../vavoom-dedicated.i686)	876	set_target_properties(vavoom-dedicated PROPERTIES OUTPUT_NAME ../vavoom-ded)
893	else(UNIX)
894	set_target_properties(vavoom-dedicated PROPERTIES OUTPUT_NAME ../vavoom-dedicated)
895	endif(UNIX)	877	endif(UNIX)
896	set_target_properties(vavoom-dedicated PROPERTIES COMPILE_FLAGS -DSERVER)	878	set_target_properties(vavoom-dedicated PROPERTIES COMPILE_FLAGS -DSERVER)
897	target_link_libraries(vavoom-dedicated glbsp ${ZLIB_LIBRARY} ${NET_LIBRARIES})	879	target_link_libraries(vavoom-dedicated glbsp ${ZLIB_LIBRARY} ${NET_LIBRARIES})
898	add_dependencies(vavoom-dedicated glbsp)	880	add_dependencies(vavoom-dedicated glbsp)
899		881
900	install(TARGETS vavoom-dedicated DESTINATION bin)	882	install(TARGETS vavoom-dedicated DESTINATION ${BINDIR})
901
902	if(UNIX)
903	file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/vavoom-dedicated
904	"#!/bin/sh
905	# Needed to make symlinks/shortcuts work.
906	# the binaries must run with correct working directory
907	cd \"${CMAKE_INSTALL_PREFIX}/${DATADIR}\"
908	\"${CMAKE_INSTALL_PREFIX}/bin/vavoom-dedicated.i686\" $* ${IWADDIR}
909	exit $?
910	")
911	install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/vavoom-dedicated DESTINATION bin)
912	endif(UNIX)
913		883
914	endif(ENABLE_SERVER)	884	endif(ENABLE_SERVER)
915		885