cmake: Use same variable name for output. Allow easier copy-paste between files. Do not know why I did not do it earlier.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3566 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gregory.hainaut 2010-07-25 13:54:26 +00:00
parent f965b0af46
commit 4e90b10c76
22 changed files with 93 additions and 91 deletions

View File

@ -1,7 +1,7 @@
# SoundTouch library
# library name
set(SoundTouchName pcsx2_SoundTouch)
set(Output pcsx2_SoundTouch)
set(CommonFlags
-march=athlon-xp
@ -59,4 +59,4 @@ set(SoundTouchHeaders
cpu_detect.h)
# add library
add_library(${SoundTouchName} STATIC ${SoundTouchSources} ${SoundTouchHeaders})
add_library(${Output} STATIC ${SoundTouchSources} ${SoundTouchHeaders})

View File

@ -1,7 +1,7 @@
# bzip2 library
# library name
set(bzip2Name pcsx2_bzip2)
set(Output pcsx2_bzip2)
set(CommonFlags
-march=athlon-xp
@ -47,4 +47,4 @@ set(bzip2Headers
bzlib_private.h)
# add library
add_library(${bzip2Name} STATIC ${bzip2Sources} ${bzip2Headers})
add_library(${Output} STATIC ${bzip2Sources} ${bzip2Headers})

View File

@ -1,7 +1,7 @@
# a52 library
# library name
set(a52Name pcsx2_a52)
set(Output pcsx2_a52)
set(CommonFlags
-Wall
@ -52,4 +52,4 @@ set(a52Headers
tendra.h)
# add library
add_library(${a52Name} STATIC ${a52Sources} ${a52Headers})
add_library(${Output} STATIC ${a52Sources} ${a52Headers})

View File

@ -1,7 +1,7 @@
# zlib library
# library name
set(zlibName pcsx2_zlib)
set(Output pcsx2_zlib)
set(CommonFlags
-W
@ -62,4 +62,4 @@ crc32.h
inftrees.h )
# add library
add_library(${zlibName} STATIC ${zlibSources} ${zlibHeaders})
add_library(${Output} STATIC ${zlibSources} ${zlibHeaders})

View File

@ -7,7 +7,7 @@ endif(NOT TOP_CMAKE_WAS_SOURCED)
# library name
set(UtilitiesName Utilities)
set(Output Utilities)
# set common flags
set(CommonFlags
@ -166,7 +166,7 @@ include_directories(.)
set_source_files_properties(${UtilitiesSSources} PROPERTIES LANGUAGE CXX)
# add library
add_library(${UtilitiesName} STATIC ${UtilitiesSources} ${UtilitiesHeaders} ${UtilitiesSSources})
add_library(${Output} STATIC ${UtilitiesSources} ${UtilitiesHeaders} ${UtilitiesSSources})
# link target with wx
target_link_libraries(${UtilitiesName} ${wxWidgets_LIBRARIES})
target_link_libraries(${Output} ${wxWidgets_LIBRARIES})

View File

@ -7,7 +7,7 @@ endif(NOT TOP_CMAKE_WAS_SOURCED)
# library name
set(x86emitterName x86emitter)
set(Output x86emitter)
# set common flags
set(CommonFlags
@ -139,7 +139,7 @@ set(x86emitterHeaders
PrecompiledHeader.h)
# add library
add_library(${x86emitterName} STATIC ${x86emitterSources} ${x86emitterHeaders})
add_library(${Output} STATIC ${x86emitterSources} ${x86emitterHeaders})
# link target with wx
target_link_libraries(${x86emitterName} ${wxWidgets_LIBRARIES})
target_link_libraries(${Output} ${wxWidgets_LIBRARIES})

View File

@ -72,7 +72,7 @@ set(OptimizationFlags
if(CMAKE_BUILD_TYPE STREQUAL Debug)
# executable name
set(pcsx2Name pcsx2-dbg)
set(Output pcsx2-dbg)
# add defines
add_definitions(${CommonFlags} ${DebugFlags} -DPCSX2_DEVBUILD -DPCSX2_DEBUG -DWX_PRECOMP)
@ -82,7 +82,7 @@ endif(CMAKE_BUILD_TYPE STREQUAL Debug)
if(CMAKE_BUILD_TYPE STREQUAL Devel)
# executable name
set(pcsx2Name pcsx2-dev)
set(Output pcsx2-dev)
# add defines
add_definitions(${CommonFlags} ${OptimizationFlags} -DPCSX2_DEVBUILD -DWX_PRECOMP -DNDEBUG)
@ -92,7 +92,7 @@ endif(CMAKE_BUILD_TYPE STREQUAL Devel)
if(CMAKE_BUILD_TYPE STREQUAL Release)
# executable name
set(pcsx2Name pcsx2)
set(Output pcsx2)
# add defines
add_definitions(${CommonFlags} ${OptimizationFlags} -DWX_PRECOMP -DNDEBUG)
@ -621,23 +621,23 @@ include_directories(.
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin)
# add executable
add_executable(${pcsx2Name}
add_executable(${Output}
${Common}
${Platform})
# add dependencies
add_dependencies(${pcsx2Name} Resources)
add_dependencies(${Output} Resources)
# link target with project internal libraries
target_link_libraries(${pcsx2Name} Utilities x86emitter)
target_link_libraries(${Output} Utilities x86emitter)
# link target with wx
target_link_libraries(${pcsx2Name} ${wxWidgets_LIBRARIES})
target_link_libraries(${Output} ${wxWidgets_LIBRARIES})
if(Linux)
# link target with gtk2
target_link_libraries(${pcsx2Name} ${GTK2_LIBRARIES})
target_link_libraries(${Output} ${GTK2_LIBRARIES})
endif(Linux)
# link target with zlib
target_link_libraries(${pcsx2Name} ${ZLIB_LIBRARIES})
target_link_libraries(${Output} ${ZLIB_LIBRARIES})

View File

@ -7,7 +7,7 @@ endif(NOT TOP_CMAKE_WAS_SOURCED)
# plugin name
set(CDVDisoName CDVDiso)
set(Output CDVDiso)
set(CommonFlags
-Wall
@ -67,15 +67,15 @@ include_directories(.
Linux)
# add library
add_library(${CDVDisoName} SHARED
add_library(${Output} SHARED
${CDVDisoSources}
${CDVDisoHeaders}
${CDVDisoLinuxSources}
${CDVDisoLinuxHeaders})
# set output directory
set_target_properties(${CDVDisoName} PROPERTIES
set_target_properties(${Output} PROPERTIES
LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin/plugins)
# Link with bz2
target_link_libraries(${CDVDisoName} ${BZIP2_LIBRARIES})
target_link_libraries(${Output} ${BZIP2_LIBRARIES})

View File

@ -1,7 +1,7 @@
# CDVDlinuz Plugin
# plugin name
set(CDVDlinuzName CDVDlinuz)
set(Output CDVDlinuz)
set(CommonFlags
-Wall
@ -82,12 +82,12 @@ include_directories(.
Linux)
# add library
add_library(${CDVDlinuzName} SHARED
add_library(${Output} SHARED
${CDVDlinuzSources}
${CDVDlinuzHeaders}
${CDVDlinuzLinuxSources}
${CDVDlinuzLinuxHeaders})
# set output directory
set_target_properties(${CDVDlinuzName} PROPERTIES
set_target_properties(${Output} PROPERTIES
LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin/plugins)

View File

@ -7,7 +7,7 @@ endif(NOT TOP_CMAKE_WAS_SOURCED)
# plugin name
set(CDVDnullName CDVDnull)
set(Output CDVDnull)
set(CommonFlags
-Wall
@ -57,11 +57,11 @@ set(CDVDnullWindowsHeaders
include_directories(.)
# add library
add_library(${CDVDnullName} SHARED
add_library(${Output} SHARED
${CDVDnullSources}
${CDVDnullHeaders}
)
# set output directory
set_target_properties(${CDVDnullName} PROPERTIES
set_target_properties(${Output} PROPERTIES
LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin/plugins)

View File

@ -7,7 +7,7 @@ endif(NOT TOP_CMAKE_WAS_SOURCED)
# plugin name
set(FWnullName FWnull)
set(Output FWnull)
set(CommonFlags
-Wall
@ -68,12 +68,12 @@ set(FWnullWindowsHeaders
include_directories(.)
# add library
add_library(${FWnullName} SHARED
add_library(${Output} SHARED
${FWnullSources}
${FWnullHeaders}
${FWnullLinuxSources}
${FWnullLinuxHeaders})
# set output directory
set_target_properties(${FWnullName} PROPERTIES
set_target_properties(${Output} PROPERTIES
LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin/plugins)

View File

@ -7,7 +7,7 @@ endif(NOT TOP_CMAKE_WAS_SOURCED)
# plugin name
set(GSnullName GSnull)
set(Output GSnull)
set(CommonFlags
-Wall
@ -84,7 +84,7 @@ set(GSnullWindowsHeaders
include_directories(.)
# add library
add_library(${GSnullName} SHARED
add_library(${Output} SHARED
${GSnullSources}
${GSnullHeaders}
${GSnullnullSources}
@ -93,5 +93,5 @@ add_library(${GSnullName} SHARED
${GSnullLinuxHeaders})
# set output directory
set_target_properties(${GSnullName} PROPERTIES
set_target_properties(${Output} PROPERTIES
LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin/plugins)

View File

@ -5,6 +5,8 @@ if(NOT TOP_CMAKE_WAS_SOURCED)
It is advice to delete all wrongly generated cmake stuff => CMakeFiles & CMakeCache.txt")
endif(NOT TOP_CMAKE_WAS_SOURCED)
# plugin name
set(Output PADnull)
set(CommonFlags
-Wall
@ -68,12 +70,12 @@ include_directories(.
Linux)
# add library
add_library(${PadNullName} SHARED
add_library(${Output} SHARED
${PadNullSources}
${PadNullHeaders}
${PadNullLinuxSources}
${PadNullLinuxHeaders})
# set output directory
set_target_properties(${PadNullName} PROPERTIES
set_target_properties(${Output} PROPERTIES
LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin/plugins)

View File

@ -7,7 +7,7 @@ endif(NOT TOP_CMAKE_WAS_SOURCED)
# plugin name
set(SPU2nullName SPU2null)
set(Output SPU2null)
set(CommonFlags
-Wall
@ -67,12 +67,12 @@ set(SPU2nullWindowsHeaders
include_directories(.)
# add library
add_library(${SPU2nullName} SHARED
add_library(${Output} SHARED
${SPU2nullSources}
${SPU2nullHeaders}
${SPU2nullLinuxSources}
${SPU2nullLinuxHeaders})
# set output directory
set_target_properties(${SPU2nullName} PROPERTIES
set_target_properties(${Output} PROPERTIES
LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin/plugins)

View File

@ -7,7 +7,7 @@ endif(NOT TOP_CMAKE_WAS_SOURCED)
# plugin name
set(USBnullName USBnull)
set(Output USBnull)
set(CommonFlags
-Wall
@ -69,12 +69,12 @@ set(USBnullWindowsHeaders
include_directories(.)
# add library
add_library(${USBnullName} SHARED
add_library(${Output} SHARED
${USBnullSources}
${USBnullHeaders}
${USBnullLinuxSources}
${USBnullLinuxHeaders})
# set output directory
set_target_properties(${USBnullName} PROPERTIES
set_target_properties(${Output} PROPERTIES
LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin/plugins)

View File

@ -7,7 +7,7 @@ endif(NOT TOP_CMAKE_WAS_SOURCED)
# plugin name
set(dev9nullName dev9null)
set(Output dev9null)
set(CommonFlags
-Wall
@ -66,12 +66,12 @@ set(dev9nullWindowsHeaders
include_directories(.)
# add library
add_library(${dev9nullName} SHARED
add_library(${Output} SHARED
${dev9nullSources}
${dev9nullHeaders}
${dev9nullLinuxSources}
${dev9nullLinuxHeaders})
# set output directory
set_target_properties(${dev9nullName} PROPERTIES
set_target_properties(${Output} PROPERTIES
LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin/plugins)

View File

@ -7,7 +7,7 @@ endif(NOT TOP_CMAKE_WAS_SOURCED)
# plugin name
set(onepadName onepad)
set(Output onepad)
set(CommonFlags
-Wall
@ -75,15 +75,15 @@ set(onepadWindowsHeaders
include_directories(.)
# add library
add_library(${onepadName} SHARED
add_library(${Output} SHARED
${onepadSources}
${onepadHeaders}
${onepadLinuxSources}
${onepadLinuxHeaders})
# set output directory
set_target_properties(${onepadName} PROPERTIES
set_target_properties(${Output} PROPERTIES
LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin/plugins)
# link target with SDL
target_link_libraries(${onepadName} ${SDL_LIBRARY})
target_link_libraries(${Output} ${SDL_LIBRARY})

View File

@ -7,7 +7,7 @@ endif(NOT TOP_CMAKE_WAS_SOURCED)
# plugin name
set(spu2xName spu2x)
set(Output spu2x)
set(CommonFlags
-Wall
@ -101,7 +101,7 @@ include_directories(.
Linux)
# add library
add_library(${spu2xName} SHARED
add_library(${Output} SHARED
${spu2xSources}
${spu2xHeaders}
${spu2xLinuxSources}
@ -109,20 +109,20 @@ add_library(${spu2xName} SHARED
# set output directory
set_target_properties(${spu2xName} PROPERTIES
set_target_properties(${Output} PROPERTIES
LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin/plugins)
# link target with project internal libraries
target_link_libraries(${spu2xName} Utilities x86emitter Utilities)
target_link_libraries(${Output} Utilities x86emitter Utilities)
# link target with ALSA
target_link_libraries(${spu2xName} ${ALSA_LIBRARIES})
target_link_libraries(${Output} ${ALSA_LIBRARIES})
# link target with PortAudio
target_link_libraries(${spu2xName} ${PORTAUDIO_LIBRARIES})
target_link_libraries(${Output} ${PORTAUDIO_LIBRARIES})
# link target with SoundTouch
target_link_libraries(${spu2xName} ${SOUNDTOUCH_LIBRARIES})
target_link_libraries(${Output} ${SOUNDTOUCH_LIBRARIES})
# link target with A52
target_link_libraries(${spu2xName} ${A52_LIBRARIES})
target_link_libraries(${Output} ${A52_LIBRARIES})

View File

@ -1,7 +1,7 @@
# zerogs Plugin
# plugin name
set(zerogsName zerogs)
set(Output zerogs)
set(CommonFlags
-Wall
@ -107,7 +107,7 @@ set_source_files_properties(${zerogsSSources} PROPERTIES LANGUAGE CXX)
include_directories(.)
# add library
add_library(${zerogsName} SHARED
add_library(${Output} SHARED
${zerogsSources}
${zerogsHeaders}
${zerogsSSources}
@ -116,24 +116,24 @@ add_library(${zerogsName} SHARED
${zerogsLinuxHeaders})
# set output directory
set_target_properties(${zerogsName} PROPERTIES
set_target_properties(${Output} PROPERTIES
LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin/plugins)
# copy ps2hw.dat to plugins folder
add_custom_command(TARGET ${zerogsName} POST_BUILD
add_custom_command(TARGET ${Output} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/plugins/zerogs/opengl/Win32/ps2hw.dat ${PROJECT_SOURCE_DIR}/bin/plugins)
# link target with Cg
target_link_libraries(${zerogsName} ${CG_LIBRARIES})
target_link_libraries(${Output} ${CG_LIBRARIES})
# link target with glew
target_link_libraries(${zerogsName} ${GLEW_LIBRARY})
target_link_libraries(${Output} ${GLEW_LIBRARY})
# link target with opengl
target_link_libraries(${zerogsName} ${OPENGL_LIBRARIES})
target_link_libraries(${Output} ${OPENGL_LIBRARIES})
# link target with X11
target_link_libraries(${zerogsName} ${X11_LIBRARIES})
target_link_libraries(${Output} ${X11_LIBRARIES})
# link target with X11 videomod
target_link_libraries(${zerogsName} ${X11_Xxf86vm_LIB})
target_link_libraries(${Output} ${X11_Xxf86vm_LIB})

View File

@ -7,7 +7,7 @@ endif(NOT TOP_CMAKE_WAS_SOURCED)
# plugin name
set(zeropadName zeropad)
set(Output zeropad)
set(CommonFlags
-Wall
@ -84,15 +84,15 @@ include_directories(.
Linux)
# add library
add_library(${zeropadName} SHARED
add_library(${Output} SHARED
${zeropadSources}
${zeropadHeaders}
${zeropadLinuxSources}
${zeropadLinuxHeaders})
# set output directory
set_target_properties(${zeropadName} PROPERTIES
set_target_properties(${Output} PROPERTIES
LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin/plugins)
# link target with SDL
target_link_libraries(${zeropadName} ${SDL_LIBRARY})
target_link_libraries(${Output} ${SDL_LIBRARY})

View File

@ -7,7 +7,7 @@ endif(NOT TOP_CMAKE_WAS_SOURCED)
# plugin name
set(zerospu2Name zerospu2)
set(Output zerospu2)
set(CommonFlags
-Wall
@ -86,23 +86,23 @@ include_directories(.
Targets)
# add library
add_library(${zerospu2Name} SHARED
add_library(${Output} SHARED
${zerospu2Sources}
${zerospu2Headers}
${zerospu2LinuxSources}
${zerospu2LinuxHeaders})
# set output directory
set_target_properties(${zerospu2Name} PROPERTIES
set_target_properties(${Output} PROPERTIES
LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin/plugins)
# link target with ALSA
target_link_libraries(${zerospu2Name} ${ALSA_LIBRARIES})
target_link_libraries(${Output} ${ALSA_LIBRARIES})
if(PORTAUDIO_FOUND)
# link target with PortAudio
#target_link_libraries(${zerospu2Name} ${PORTAUDIO_LIBRARIES})
#target_link_libraries(${Output} ${PORTAUDIO_LIBRARIES})
endif(PORTAUDIO_FOUND)
# link target with SoundTouch
target_link_libraries(${zerospu2Name} ${SOUNDTOUCH_LIBRARIES})
target_link_libraries(${Output} ${SOUNDTOUCH_LIBRARIES})

View File

@ -7,7 +7,7 @@ endif(NOT TOP_CMAKE_WAS_SOURCED)
# plugin name
set(zzoglName zzogl)
set(Output zzogl)
set(CommonFlags
-pthread
@ -123,7 +123,7 @@ include_directories(.
Linux)
# add library
add_library(${zzoglName} SHARED
add_library(${Output} SHARED
${zzoglSources}
${zzoglHeaders}
${zzoglSSources}
@ -132,28 +132,28 @@ add_library(${zzoglName} SHARED
${zzoglLinuxHeaders})
# set output directory
set_target_properties(${zzoglName} PROPERTIES
set_target_properties(${Output} PROPERTIES
LIBRARY_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin/plugins)
# WARNING can conflict with zerogs plugin
# copy ps2hw.dat to plugins folder
add_custom_command(TARGET ${zzoglName} POST_BUILD
add_custom_command(TARGET ${Output} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/plugins/zzogl-pg/opengl/ps2hw.dat ${PROJECT_SOURCE_DIR}/bin/plugins)
# link target with project internal libraries
target_link_libraries(${zzoglName} Utilities)
target_link_libraries(${Output} Utilities)
# link target with Cg
target_link_libraries(${zzoglName} ${CG_LIBRARIES})
target_link_libraries(${Output} ${CG_LIBRARIES})
# link target with glew
target_link_libraries(${zzoglName} ${GLEW_LIBRARY})
target_link_libraries(${Output} ${GLEW_LIBRARY})
# link target with opengl
target_link_libraries(${zzoglName} ${OPENGL_LIBRARIES})
target_link_libraries(${Output} ${OPENGL_LIBRARIES})
# link target with X11
target_link_libraries(${zzoglName} ${X11_LIBRARIES})
target_link_libraries(${Output} ${X11_LIBRARIES})
# link target with X11 videomod
target_link_libraries(${zzoglName} ${X11_Xxf86vm_LIB})
target_link_libraries(${Output} ${X11_Xxf86vm_LIB})