Attachment #242847 for bug #332115

View | Details | Raw Unified | Return to bug 332115
Collapse All | Expand All




# liblightspark.so target
ADD_LIBRARY(spark SHARED ${LIBSPARK_SOURCES})
SET_TARGET_PROPERTIES(spark PROPERTIES OUTPUT_NAME lightspark)
TARGET_LINK_LIBRARIES(spark ${CMAKE_MODULE_LINKER_FLAGS} ${SOUND_LIBS_LIBRARIES} ${EXTRA_LIBS_LIBRARIES} ${ZLIB_LIBRARIES} ${LLVM_LIBS_CORE} ${LLVM_LIBS_JIT} ${SDL_LIBRARY} ${OPTIONAL_LIBRARIES} ${GTK_LIBRARIES} ${lib_glew})
SET_TARGET_PROPERTIES(spark PROPERTIES LINK_FLAGS "${LLVM_LDFLAGS} -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/lightspark.expmap")
SET_TARGET_PROPERTIES(spark PROPERTIES LINK_INTERFACE_LIBRARIES "")


IF(COMPILE_LIGHTSPARK)
	ADD_EXECUTABLE(lightspark main.cpp)
	TARGET_LINK_LIBRARIES(lightspark spark)
	TARGET_LINK_LIBRARIES(lightspark ${SDL_LIBRARY}	${CMAKE_MODULE_LINKER_FLAGS})

	IF(UNIX)
		INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lightspark.frag DESTINATION ${DATADIR}/lightspark)

# tightspark executable target
IF(COMPILE_TIGHTSPARK)
	ADD_EXECUTABLE(tightspark tightspark.cpp)
	TARGET_LINK_LIBRARIES(tightspark spark ${CMAKE_MODULE_LINKER_FLAGS})

	IF(UNIX)
		INSTALL(TARGETS tightspark RUNTIME DESTINATION ${BINDIR})

Lines 31-37 ENDIF(UNIX) Link Here

(-)lightspark-0.4.3/plugin-dir/CMakeLists.txt (-1 / +1 lines)
31		31
32	# Firefox plugin target	32	# Firefox plugin target
33	ADD_LIBRARY(lightsparkplugin SHARED np_entry.cpp npn_gate.cpp npp_gate.cpp plugin.cpp)	33	ADD_LIBRARY(lightsparkplugin SHARED np_entry.cpp npn_gate.cpp npp_gate.cpp plugin.cpp)
34	TARGET_LINK_LIBRARIES(lightsparkplugin spark ${MOZ_PLUGIN_LIBRARIES} ${GTK_LIBRARIES})	34	TARGET_LINK_LIBRARIES(lightsparkplugin spark ${CMAKE_MODULE_LINKER_FLAGS} ${MOZ_PLUGIN_LIBRARIES} ${GTK_LIBRARIES})
35		35
36	IF(UNIX)	36	IF(UNIX)
37	INSTALL(TARGETS lightsparkplugin LIBRARY DESTINATION ${PLUGIN_DIRECTORY})	37	INSTALL(TARGETS lightsparkplugin LIBRARY DESTINATION ${PLUGIN_DIRECTORY})

Return to bug 332115

Lines 199-205 ENDIF(${i386}) Link Here

(-)lightspark-0.4.3/CMakeLists.txt (-3 / +3 lines)
199	# liblightspark.so target	199	# liblightspark.so target
200	ADD_LIBRARY(spark SHARED ${LIBSPARK_SOURCES})	200	ADD_LIBRARY(spark SHARED ${LIBSPARK_SOURCES})
201	SET_TARGET_PROPERTIES(spark PROPERTIES OUTPUT_NAME lightspark)	201	SET_TARGET_PROPERTIES(spark PROPERTIES OUTPUT_NAME lightspark)
202	TARGET_LINK_LIBRARIES(spark ${SOUND_LIBS_LIBRARIES} ${EXTRA_LIBS_LIBRARIES} ${ZLIB_LIBRARIES} ${LLVM_LIBS_CORE} ${LLVM_LIBS_JIT} ${SDL_LIBRARY} ${OPTIONAL_LIBRARIES} ${GTK_LIBRARIES} ${lib_glew})	202	TARGET_LINK_LIBRARIES(spark ${CMAKE_MODULE_LINKER_FLAGS} ${SOUND_LIBS_LIBRARIES} ${EXTRA_LIBS_LIBRARIES} ${ZLIB_LIBRARIES} ${LLVM_LIBS_CORE} ${LLVM_LIBS_JIT} ${SDL_LIBRARY} ${OPTIONAL_LIBRARIES} ${GTK_LIBRARIES} ${lib_glew})
203	SET_TARGET_PROPERTIES(spark PROPERTIES LINK_FLAGS "${LLVM_LDFLAGS} -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/lightspark.expmap")	203	SET_TARGET_PROPERTIES(spark PROPERTIES LINK_FLAGS "${LLVM_LDFLAGS} -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/lightspark.expmap")
204	SET_TARGET_PROPERTIES(spark PROPERTIES LINK_INTERFACE_LIBRARIES "")	204	SET_TARGET_PROPERTIES(spark PROPERTIES LINK_INTERFACE_LIBRARIES "")
205		205
Lines 214-220 ENDIF(UNIX) Link Here
214	IF(COMPILE_LIGHTSPARK)	214	IF(COMPILE_LIGHTSPARK)
215	ADD_EXECUTABLE(lightspark main.cpp)	215	ADD_EXECUTABLE(lightspark main.cpp)
216	TARGET_LINK_LIBRARIES(lightspark spark)	216	TARGET_LINK_LIBRARIES(lightspark spark)
217	TARGET_LINK_LIBRARIES(lightspark ${SDL_LIBRARY})	217	TARGET_LINK_LIBRARIES(lightspark ${SDL_LIBRARY} ${CMAKE_MODULE_LINKER_FLAGS})
218		218
219	IF(UNIX)	219	IF(UNIX)
220	INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lightspark.frag DESTINATION ${DATADIR}/lightspark)	220	INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lightspark.frag DESTINATION ${DATADIR}/lightspark)
Lines 227-233 ENDIF(COMPILE_LIGHTSPARK) Link Here
227	# tightspark executable target	227	# tightspark executable target
228	IF(COMPILE_TIGHTSPARK)	228	IF(COMPILE_TIGHTSPARK)
229	ADD_EXECUTABLE(tightspark tightspark.cpp)	229	ADD_EXECUTABLE(tightspark tightspark.cpp)
230	TARGET_LINK_LIBRARIES(tightspark spark)	230	TARGET_LINK_LIBRARIES(tightspark spark ${CMAKE_MODULE_LINKER_FLAGS})
231		231
232	IF(UNIX)	232	IF(UNIX)
233	INSTALL(TARGETS tightspark RUNTIME DESTINATION ${BINDIR})	233	INSTALL(TARGETS tightspark RUNTIME DESTINATION ${BINDIR})