Menu
▾
▴
[Gemrb-commits] gemrb: branch master updated. 0c1931e1bb75666b7d502eb070712a2f6102b654
|
From: Alyssa M. <fu...@us...> - 2010-04-10 20:35:35
|
gemrb: Infinity Engine emulator
The branch master has been updated
via 0c1931e1bb75666b7d502eb070712a2f6102b654 (commit)
via 20dbcee0417d30a94610929688574bd1d37c4557 (commit)
via a3982e1b45b3534dbb83479e6e7d9534f870f303 (commit)
Summary of changes:
CMakeLists.txt | 101 ++++++++++++++++++------
gemrb/CMakeLists.txt | 6 +-
gemrb/GUIScripts/CMakeLists.txt | 2 +-
gemrb/GUIScripts/bg1/CMakeLists.txt | 2 +-
gemrb/GUIScripts/bg2/CMakeLists.txt | 2 +-
gemrb/GUIScripts/iwd/CMakeLists.txt | 2 +-
gemrb/GUIScripts/iwd2/CMakeLists.txt | 2 +-
gemrb/GUIScripts/pst/CMakeLists.txt | 2 +-
gemrb/GUIScripts/test1/CMakeLists.txt | 2 +-
gemrb/plugins/2DAImporter/CMakeLists.txt | 2 -
gemrb/plugins/ACMImporter/CMakeLists.txt | 2 -
gemrb/plugins/AREImporter/CMakeLists.txt | 2 -
gemrb/plugins/BAMImporter/CMakeLists.txt | 2 -
gemrb/plugins/BIFImporter/CMakeLists.txt | 2 -
gemrb/plugins/BIKPlayer/CMakeLists.txt | 2 -
gemrb/plugins/BMPImporter/CMakeLists.txt | 2 -
gemrb/plugins/BMPWriter/CMakeLists.txt | 2 -
gemrb/plugins/CHUImporter/CMakeLists.txt | 2 -
gemrb/plugins/CREImporter/CMakeLists.txt | 2 -
gemrb/plugins/Core/CMakeLists.txt | 11 ++-
gemrb/plugins/DLGImporter/CMakeLists.txt | 2 -
gemrb/plugins/DirectoryImporter/CMakeLists.txt | 2 -
gemrb/plugins/EFFImporter/CMakeLists.txt | 2 -
gemrb/plugins/FXOpcodes/CMakeLists.txt | 2 -
gemrb/plugins/GAMImporter/CMakeLists.txt | 2 -
gemrb/plugins/GUIScript/CMakeLists.txt | 2 -
gemrb/plugins/IDSImporter/CMakeLists.txt | 2 -
gemrb/plugins/INIImporter/CMakeLists.txt | 2 -
gemrb/plugins/ITMImporter/CMakeLists.txt | 2 -
gemrb/plugins/IWDOpcodes/CMakeLists.txt | 2 -
gemrb/plugins/KEYImporter/CMakeLists.txt | 2 -
gemrb/plugins/MOSImporter/CMakeLists.txt | 2 -
gemrb/plugins/MUSImporter/CMakeLists.txt | 2 -
gemrb/plugins/MVEPlayer/CMakeLists.txt | 2 -
gemrb/plugins/NullSound/CMakeLists.txt | 2 -
gemrb/plugins/OpenALAudio/CMakeLists.txt | 1 -
gemrb/plugins/PLTImporter/CMakeLists.txt | 2 -
gemrb/plugins/PNGImporter/CMakeLists.txt | 1 -
gemrb/plugins/PROImporter/CMakeLists.txt | 2 -
gemrb/plugins/PSTOpcodes/CMakeLists.txt | 2 -
gemrb/plugins/SDLVideo/CMakeLists.txt | 2 -
gemrb/plugins/SPLImporter/CMakeLists.txt | 2 -
gemrb/plugins/STOImporter/CMakeLists.txt | 2 -
gemrb/plugins/TISImporter/CMakeLists.txt | 2 -
gemrb/plugins/TLKImporter/CMakeLists.txt | 2 -
gemrb/plugins/WEDImporter/CMakeLists.txt | 2 -
gemrb/plugins/WMPImporter/CMakeLists.txt | 2 -
gemrb/plugins/ZLibManager/CMakeLists.txt | 2 -
48 files changed, 92 insertions(+), 114 deletions(-)
from a9800a072456d28cf2d30fa3b20363c295dbe9ff (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=0c1931e1bb75666b7d502eb070712a2f6102b654
commit 0c1931e1bb75666b7d502eb070712a2f6102b654
Author: Tom Prince <tom...@ua...>
Date: Sat Apr 10 14:13:48 2010 -0400
cmake: Change RPATH settings to be more consistent over platforms.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7ceddf8..940d7e2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -177,15 +177,11 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake_config.h.in ${CMAKE_CURRENT_BIN
#Plugin addition macro
MACRO(ADD_GEMRB_PLUGIN plugin_name)
-ADD_LIBRARY(${plugin_name} MODULE ${ARGN})
-SET_TARGET_PROPERTIES(${plugin_name} PROPERTIES PREFIX "")
-IF(WIN32)
- TARGET_LINK_LIBRARIES(${plugin_name} gemrb_core)
-ENDIF(WIN32)
-IF(APPLE)
- TARGET_LINK_LIBRARIES(${plugin_name} gemrb_core)
-ENDIF(APPLE)
-INSTALL(TARGETS ${plugin_name} DESTINATION ${PLUGIN_DIR})
+ ADD_LIBRARY(${plugin_name} MODULE ${ARGN})
+ SET_TARGET_PROPERTIES(${plugin_name} PROPERTIES PREFIX ""
+ INSTALL_RPATH ${LIB_DIR})
+ TARGET_LINK_LIBRARIES(${plugin_name} gemrb_core)
+ INSTALL(TARGETS ${plugin_name} DESTINATION ${PLUGIN_DIR})
ENDMACRO(ADD_GEMRB_PLUGIN)
#gemrb overrides macro
diff --git a/gemrb/CMakeLists.txt b/gemrb/CMakeLists.txt
index ab85fa9..af81ef4 100644
--- a/gemrb/CMakeLists.txt
+++ b/gemrb/CMakeLists.txt
@@ -3,10 +3,10 @@ ADD_SUBDIRECTORY( override )
ADD_SUBDIRECTORY( GUIScripts )
ADD_EXECUTABLE(gemrb GemRB.cpp )
+SET_TARGET_PROPERTIES(gemrb PROPERTIES INSTALL_RPATH ${LIB_DIR})
IF(WIN32)
TARGET_LINK_LIBRARIES(gemrb gemrb_core)
ELSE(WIN32)
- SET_TARGET_PROPERTIES(gemrb PROPERTIES INSTALL_RPATH ${LIB_DIR})
IF(APPLE)
TARGET_LINK_LIBRARIES(gemrb gemrb_core ${SDL_LIBRARY} ${SDL_MAIN_LIBRARY_PATH} ${COCOA_LIBRARY_PATH} ${DLD_LIBRARY_PATH})
ELSE(APPLE)
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=20dbcee0417d30a94610929688574bd1d37c4557
commit 20dbcee0417d30a94610929688574bd1d37c4557
Author: Tom Prince <tom...@ua...>
Date: Fri Apr 9 17:31:19 2010 -0400
cmake: Add LAYOUT option to control install paths.
- home: current layout.
- fhs: (mostly?) Filesystem Hierarchy Standard compliant.
- opt: modified fhs, without gemrb subdirectories.
Signed-off-by: Tom Prince <tom...@ua...>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 83121c3..7ceddf8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,21 +11,75 @@ IF(PREFIX)
SET(CMAKE_INSTALL_PREFIX ${PREFIX})
ENDIF(PREFIX)
-IF( NOT PLUGIN_INSTALL_DIR )
- SET( PLUGIN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/plugins )
-ENDIF( NOT PLUGIN_INSTALL_DIR )
+if (NOT "${LAYOUT}")
+ if (WIN32)
+ set(LAYOUT "home")
+ else (WIN32)
+ set(LAYOUT "fhs")
+ endif (WIN32)
+endif (NOT "${LAYOUT}")
+
+SET(LAYOUT CACHE STRING "Directory layout.")
+
+if (${LAYOUT} MATCHES "home")
+ IF( NOT PLUGIN_DIR )
+ SET( PLUGIN_DIR ${CMAKE_INSTALL_PREFIX}/plugins )
+ ENDIF( NOT PLUGIN_DIR )
+ IF( NOT DATA_DIR )
+ SET( DATA_DIR ${CMAKE_INSTALL_PREFIX} )
+ ENDIF( NOT DATA_DIR )
+ IF( NOT MAN_DIR )
+ SET( MAN_DIR ${CMAKE_INSTALL_PREFIX}/man/man6 )
+ ENDIF( NOT MAN_DIR )
+ IF( NOT BIN_DIR )
+ SET( BIN_DIR ${CMAKE_INSTALL_PREFIX} )
+ ENDIF( NOT BIN_DIR )
+ IF( NOT SYSCONF_DIR )
+ SET( SYSCONF_DIR ${CMAKE_INSTALL_PREFIX} )
+ ENDIF( NOT SYSCONF_DIR )
+ IF( NOT LIB_DIR )
+ SET( LIB_DIR ${CMAKE_INSTALL_PREFIX} )
+ ENDIF( NOT LIB_DIR )
+elseif (${LAYOUT} MATCHES "fhs")
+ IF( NOT LIB_DIR )
+ SET( LIB_DIR ${CMAKE_INSTALL_PREFIX}/lib/gemrb )
+ ENDIF( NOT LIB_DIR )
+ IF( NOT PLUGIN_DIR )
+ SET( PLUGIN_DIR ${LIB_DIR}/plugins )
+ ENDIF( NOT PLUGIN_DIR )
+ IF( NOT DATA_DIR )
+ SET( DATA_DIR ${CMAKE_INSTALL_PREFIX}/share/gemrb )
+ ENDIF( NOT DATA_DIR )
+ IF( NOT MAN_DIR )
+ SET( MAN_DIR ${CMAKE_INSTALL_PREFIX}/share/man/man6 )
+ ENDIF( NOT MAN_DIR )
+ IF( NOT BIN_DIR )
+ SET( BIN_DIR ${CMAKE_INSTALL_PREFIX}/bin )
+ ENDIF( NOT BIN_DIR )
+ IF( NOT SYSCONF_DIR )
+ SET( SYSCONF_DIR ${CMAKE_INSTALL_PREFIX}/etc/gemrb )
+ ENDIF( NOT SYSCONF_DIR )
+else (${LAYOUT} MATCHES "opt")
+ IF( NOT LIB_DIR )
+ SET( LIB_DIR ${CMAKE_INSTALL_PREFIX}/lib )
+ ENDIF( NOT LIB_DIR )
+ IF( NOT PLUGIN_DIR )
+ SET( PLUGIN_DIR ${LIB_DIR}/plugins )
+ ENDIF( NOT PLUGIN_DIR )
+ IF( NOT DATA_DIR )
+ SET( DATA_DIR ${CMAKE_INSTALL_PREFIX}/share/ )
+ ENDIF( NOT DATA_DIR )
+ IF( NOT MAN_DIR )
+ SET( MAN_DIR ${CMAKE_INSTALL_PREFIX}/man/man6 )
+ ENDIF( NOT MAN_DIR )
+ IF( NOT BIN_DIR )
+ SET( BIN_DIR ${CMAKE_INSTALL_PREFIX}/bin )
+ ENDIF( NOT BIN_DIR )
+ IF( NOT SYSCONF_DIR )
+ SET( SYSCONF_DIR ${CMAKE_INSTALL_PREFIX}/etc )
+ ENDIF( NOT SYSCONF_DIR )
+endif (${LAYOUT} MATCHES "home")
-IF( NOT OVERRIDE_INSTALL_DIR )
- SET( OVERRIDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/override )
-ENDIF( NOT OVERRIDE_INSTALL_DIR )
-
-IF( NOT GUISCRIPTS_INSTALL_DIR )
- SET( GUISCRIPTS_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/GUIScripts )
-ENDIF( NOT GUISCRIPTS_INSTALL_DIR )
-
-IF( NOT MANPAGE_INSTALL_DIR )
- SET( MANPAGE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/man/man6 )
-ENDIF( NOT MANPAGE_INSTALL_DIR )
IF(CMAKE_COMPILER_IS_GNUCXX)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror")
@@ -80,7 +134,7 @@ ENDIF(UNIX)
MESSAGE(STATUS "Looking for Ogg Vorbis support")
FIND_LIBRARY(VORBIS_LIBRARY vorbisfile)
-ADD_DEFINITIONS("-DHAVE_CONFIG_H" -DPLUGINDIR="${PLUGIN_INSTALL_DIR}")
+ADD_DEFINITIONS("-DHAVE_CONFIG_H")
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
@@ -131,17 +185,17 @@ ENDIF(WIN32)
IF(APPLE)
TARGET_LINK_LIBRARIES(${plugin_name} gemrb_core)
ENDIF(APPLE)
-INSTALL(TARGETS ${plugin_name} DESTINATION ${PLUGIN_INSTALL_DIR})
+INSTALL(TARGETS ${plugin_name} DESTINATION ${PLUGIN_DIR})
ENDMACRO(ADD_GEMRB_PLUGIN)
#gemrb overrides macro
MACRO(ADD_GEMRB_OVERRIDE game_name)
FILE( GLOB FILES_TO_INSTALL *.2da *.bmp *.ini *.chu *.ids *.bcs *.vvc *.mos *.spl *.wav *.pro)
-INSTALL( FILES ${FILES_TO_INSTALL} DESTINATION ${OVERRIDE_INSTALL_DIR}/${game_name} )
+INSTALL( FILES ${FILES_TO_INSTALL} DESTINATION ${DATA_DIR}/override/${game_name} )
ENDMACRO(ADD_GEMRB_OVERRIDE )
ADD_SUBDIRECTORY( gemrb )
-INSTALL( FILES gemrb.6 DESTINATION ${MANPAGE_INSTALL_DIR} )
+INSTALL( FILES gemrb.6 DESTINATION ${MAN_DIR} )
CONFIGURE_FILE(
"${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
diff --git a/gemrb/CMakeLists.txt b/gemrb/CMakeLists.txt
index b1f063a..ab85fa9 100644
--- a/gemrb/CMakeLists.txt
+++ b/gemrb/CMakeLists.txt
@@ -6,7 +6,7 @@ ADD_EXECUTABLE(gemrb GemRB.cpp )
IF(WIN32)
TARGET_LINK_LIBRARIES(gemrb gemrb_core)
ELSE(WIN32)
- SET_TARGET_PROPERTIES(gemrb PROPERTIES INSTALL_RPATH ${PLUGIN_INSTALL_DIR})
+ SET_TARGET_PROPERTIES(gemrb PROPERTIES INSTALL_RPATH ${LIB_DIR})
IF(APPLE)
TARGET_LINK_LIBRARIES(gemrb gemrb_core ${SDL_LIBRARY} ${SDL_MAIN_LIBRARY_PATH} ${COCOA_LIBRARY_PATH} ${DLD_LIBRARY_PATH})
ELSE(APPLE)
@@ -14,5 +14,5 @@ ELSE(WIN32)
ENDIF(APPLE)
ENDIF(WIN32)
-INSTALL( TARGETS gemrb DESTINATION ${CMAKE_INSTALL_PREFIX})
-INSTALL( FILES GemRB.cfg.sample GemRB.cfg.subdir.sample DESTINATION ${CMAKE_INSTALL_PREFIX} )
+INSTALL( TARGETS gemrb DESTINATION ${BIN_DIR} )
+INSTALL( FILES GemRB.cfg.sample GemRB.cfg.subdir.sample DESTINATION ${SYSCONF_DIR} )
diff --git a/gemrb/GUIScripts/CMakeLists.txt b/gemrb/GUIScripts/CMakeLists.txt
index e650f83..0cf5062 100644
--- a/gemrb/GUIScripts/CMakeLists.txt
+++ b/gemrb/GUIScripts/CMakeLists.txt
@@ -1,6 +1,6 @@
FILE( GLOB FILES_TO_INSTALL *.py )
-INSTALL( FILES ${FILES_TO_INSTALL} DESTINATION ${GUISCRIPTS_INSTALL_DIR} )
+INSTALL( FILES ${FILES_TO_INSTALL} DESTINATION ${DATA_DIR}/GUIScripts )
ADD_SUBDIRECTORY( bg1 )
ADD_SUBDIRECTORY( bg2 )
diff --git a/gemrb/GUIScripts/bg1/CMakeLists.txt b/gemrb/GUIScripts/bg1/CMakeLists.txt
index 7ce52a5..965e7a6 100644
--- a/gemrb/GUIScripts/bg1/CMakeLists.txt
+++ b/gemrb/GUIScripts/bg1/CMakeLists.txt
@@ -1,3 +1,3 @@
FILE( GLOB FILES_TO_INSTALL *.py )
-INSTALL( FILES ${FILES_TO_INSTALL} DESTINATION ${GUISCRIPTS_INSTALL_DIR}/bg1 )
\ No newline at end of file
+INSTALL( FILES ${FILES_TO_INSTALL} DESTINATION ${DATA_DIR}/GUIScripts/bg1 )
diff --git a/gemrb/GUIScripts/bg2/CMakeLists.txt b/gemrb/GUIScripts/bg2/CMakeLists.txt
index 447f6ea..577d1c2 100644
--- a/gemrb/GUIScripts/bg2/CMakeLists.txt
+++ b/gemrb/GUIScripts/bg2/CMakeLists.txt
@@ -1,3 +1,3 @@
FILE( GLOB FILES_TO_INSTALL *.py )
-INSTALL( FILES ${FILES_TO_INSTALL} DESTINATION ${GUISCRIPTS_INSTALL_DIR}/bg2 )
\ No newline at end of file
+INSTALL( FILES ${FILES_TO_INSTALL} DESTINATION ${DATA_DIR}/GUIScripts/bg2 )
diff --git a/gemrb/GUIScripts/iwd/CMakeLists.txt b/gemrb/GUIScripts/iwd/CMakeLists.txt
index 3be2cf8..afd062e 100644
--- a/gemrb/GUIScripts/iwd/CMakeLists.txt
+++ b/gemrb/GUIScripts/iwd/CMakeLists.txt
@@ -1,3 +1,3 @@
FILE( GLOB FILES_TO_INSTALL *.py )
-INSTALL( FILES ${FILES_TO_INSTALL} DESTINATION ${GUISCRIPTS_INSTALL_DIR}/iwd )
\ No newline at end of file
+INSTALL( FILES ${FILES_TO_INSTALL} DESTINATION ${DATA_DIR}/GUIScripts/iwd )
diff --git a/gemrb/GUIScripts/iwd2/CMakeLists.txt b/gemrb/GUIScripts/iwd2/CMakeLists.txt
index 6a6c71f..b6ffcaa 100644
--- a/gemrb/GUIScripts/iwd2/CMakeLists.txt
+++ b/gemrb/GUIScripts/iwd2/CMakeLists.txt
@@ -1,3 +1,3 @@
FILE( GLOB FILES_TO_INSTALL *.py )
-INSTALL( FILES ${FILES_TO_INSTALL} DESTINATION ${GUISCRIPTS_INSTALL_DIR}/iwd2 )
\ No newline at end of file
+INSTALL( FILES ${FILES_TO_INSTALL} DESTINATION ${DATA_DIR}/GUIScripts/iwd2 )
diff --git a/gemrb/GUIScripts/pst/CMakeLists.txt b/gemrb/GUIScripts/pst/CMakeLists.txt
index 49ebe20..111981a 100644
--- a/gemrb/GUIScripts/pst/CMakeLists.txt
+++ b/gemrb/GUIScripts/pst/CMakeLists.txt
@@ -1,3 +1,3 @@
FILE( GLOB FILES_TO_INSTALL *.py )
-INSTALL( FILES ${FILES_TO_INSTALL} DESTINATION ${GUISCRIPTS_INSTALL_DIR}/pst )
\ No newline at end of file
+INSTALL( FILES ${FILES_TO_INSTALL} DESTINATION ${DATA_DIR}/GUIScripts/pst )
diff --git a/gemrb/GUIScripts/test1/CMakeLists.txt b/gemrb/GUIScripts/test1/CMakeLists.txt
index 4143a80..5dc24b3 100644
--- a/gemrb/GUIScripts/test1/CMakeLists.txt
+++ b/gemrb/GUIScripts/test1/CMakeLists.txt
@@ -1,3 +1,3 @@
FILE( GLOB FILES_TO_INSTALL *.py )
-INSTALL( FILES ${FILES_TO_INSTALL} DESTINATION ${GUISCRIPTS_INSTALL_DIR}/test1 )
\ No newline at end of file
+INSTALL( FILES ${FILES_TO_INSTALL} DESTINATION ${DATA_DIR}/GUIScripts/test1 )
diff --git a/gemrb/plugins/Core/CMakeLists.txt b/gemrb/plugins/Core/CMakeLists.txt
index 0fd7da5..97d62b7 100644
--- a/gemrb/plugins/Core/CMakeLists.txt
+++ b/gemrb/plugins/Core/CMakeLists.txt
@@ -4,8 +4,9 @@ FILE(GLOB gemrb_core_LIB_SRCS "*.cpp")
ADD_LIBRARY(gemrb_core SHARED ${gemrb_core_LIB_SRCS} )
-IF(WIN32)
- INSTALL(TARGETS gemrb_core RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
-ELSE(WIN32)
- INSTALL(TARGETS gemrb_core LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR})
-ENDIF(WIN32)
+SET_TARGET_PROPERTIES(gemrb_core PROPERTIES
+ COMPILE_DEFINITIONS
+ "PLUGINDIR=\"${PLUGIN_DIR}\";DATADIR=\"${DATA_DIR}\";SYSCONFDIR=\"${SYSCONF_DIR}\""
+ )
+
+INSTALL(TARGETS gemrb_core LIBRARY DESTINATION ${LIB_DIR})
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=a3982e1b45b3534dbb83479e6e7d9534f870f303
commit a3982e1b45b3534dbb83479e6e7d9534f870f303
Author: Tom Prince <tom...@ua...>
Date: Fri Apr 9 10:56:09 2010 -0400
cmake: Move installation of plugins to macro.
Signed-off-by: Tom Prince <tom...@ua...>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c9d3eeb..83121c3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -131,6 +131,7 @@ ENDIF(WIN32)
IF(APPLE)
TARGET_LINK_LIBRARIES(${plugin_name} gemrb_core)
ENDIF(APPLE)
+INSTALL(TARGETS ${plugin_name} DESTINATION ${PLUGIN_INSTALL_DIR})
ENDMACRO(ADD_GEMRB_PLUGIN)
#gemrb overrides macro
diff --git a/gemrb/plugins/2DAImporter/CMakeLists.txt b/gemrb/plugins/2DAImporter/CMakeLists.txt
index a4ad4c8..b669d2b 100644
--- a/gemrb/plugins/2DAImporter/CMakeLists.txt
+++ b/gemrb/plugins/2DAImporter/CMakeLists.txt
@@ -1,3 +1 @@
ADD_GEMRB_PLUGIN(2DAImporter 2DAImporter.cpp 2DAImporter.h )
-
-INSTALL( TARGETS 2DAImporter DESTINATION ${PLUGIN_INSTALL_DIR} )
diff --git a/gemrb/plugins/ACMImporter/CMakeLists.txt b/gemrb/plugins/ACMImporter/CMakeLists.txt
index 36205ab..04dd9fa 100644
--- a/gemrb/plugins/ACMImporter/CMakeLists.txt
+++ b/gemrb/plugins/ACMImporter/CMakeLists.txt
@@ -3,5 +3,3 @@ FILE( GLOB ACMImporter_files *.cpp )
ADD_GEMRB_PLUGIN (ACMImporter ${ACMImporter_files})
TARGET_LINK_LIBRARIES(ACMImporter ${VORBIS_LIBRARY})
-
-INSTALL( TARGETS ACMImporter DESTINATION ${PLUGIN_INSTALL_DIR} )
\ No newline at end of file
diff --git a/gemrb/plugins/AREImporter/CMakeLists.txt b/gemrb/plugins/AREImporter/CMakeLists.txt
index 320a837..9eea480 100644
--- a/gemrb/plugins/AREImporter/CMakeLists.txt
+++ b/gemrb/plugins/AREImporter/CMakeLists.txt
@@ -1,3 +1 @@
ADD_GEMRB_PLUGIN (AREImporter AREImporter.cpp)
-
-INSTALL( TARGETS AREImporter DESTINATION ${PLUGIN_INSTALL_DIR} )
diff --git a/gemrb/plugins/BAMImporter/CMakeLists.txt b/gemrb/plugins/BAMImporter/CMakeLists.txt
index f619362..1152b8e 100644
--- a/gemrb/plugins/BAMImporter/CMakeLists.txt
+++ b/gemrb/plugins/BAMImporter/CMakeLists.txt
@@ -1,3 +1 @@
ADD_GEMRB_PLUGIN (BAMImporter BAMImporter.cpp)
-
-INSTALL( TARGETS BAMImporter DESTINATION ${PLUGIN_INSTALL_DIR} )
diff --git a/gemrb/plugins/BIFImporter/CMakeLists.txt b/gemrb/plugins/BIFImporter/CMakeLists.txt
index 60a84da..11cb1d8 100644
--- a/gemrb/plugins/BIFImporter/CMakeLists.txt
+++ b/gemrb/plugins/BIFImporter/CMakeLists.txt
@@ -1,3 +1 @@
ADD_GEMRB_PLUGIN (BIFImporter BIFImporter.cpp)
-
-INSTALL( TARGETS BIFImporter DESTINATION ${PLUGIN_INSTALL_DIR} )
diff --git a/gemrb/plugins/BIKPlayer/CMakeLists.txt b/gemrb/plugins/BIKPlayer/CMakeLists.txt
index 05aab7f..6126d43 100644
--- a/gemrb/plugins/BIKPlayer/CMakeLists.txt
+++ b/gemrb/plugins/BIKPlayer/CMakeLists.txt
@@ -1,3 +1 @@
ADD_GEMRB_PLUGIN ( BIKPlayer BIKPlayer.cpp dct.cpp fft.cpp GetBitContext.cpp mem.cpp rational.cpp rdft.cpp )
-
-INSTALL( TARGETS BIKPlayer DESTINATION ${PLUGIN_INSTALL_DIR} )
diff --git a/gemrb/plugins/BMPImporter/CMakeLists.txt b/gemrb/plugins/BMPImporter/CMakeLists.txt
index dd9feaf..0738b20 100644
--- a/gemrb/plugins/BMPImporter/CMakeLists.txt
+++ b/gemrb/plugins/BMPImporter/CMakeLists.txt
@@ -1,3 +1 @@
ADD_GEMRB_PLUGIN (BMPImporter BMPImporter.cpp)
-
-INSTALL( TARGETS BMPImporter DESTINATION ${PLUGIN_INSTALL_DIR} )
diff --git a/gemrb/plugins/BMPWriter/CMakeLists.txt b/gemrb/plugins/BMPWriter/CMakeLists.txt
index 7170da4..f435043 100644
--- a/gemrb/plugins/BMPWriter/CMakeLists.txt
+++ b/gemrb/plugins/BMPWriter/CMakeLists.txt
@@ -1,3 +1 @@
ADD_GEMRB_PLUGIN (BMPWriter BMPWriter.cpp)
-
-INSTALL( TARGETS BMPWriter DESTINATION ${PLUGIN_INSTALL_DIR} )
diff --git a/gemrb/plugins/CHUImporter/CMakeLists.txt b/gemrb/plugins/CHUImporter/CMakeLists.txt
index 34fd49b..c76f9fd 100644
--- a/gemrb/plugins/CHUImporter/CMakeLists.txt
+++ b/gemrb/plugins/CHUImporter/CMakeLists.txt
@@ -1,3 +1 @@
ADD_GEMRB_PLUGIN (CHUImporter CHUImporter.cpp)
-
-INSTALL( TARGETS CHUImporter DESTINATION ${PLUGIN_INSTALL_DIR} )
diff --git a/gemrb/plugins/CREImporter/CMakeLists.txt b/gemrb/plugins/CREImporter/CMakeLists.txt
index 0691fac..d4c324d 100644
--- a/gemrb/plugins/CREImporter/CMakeLists.txt
+++ b/gemrb/plugins/CREImporter/CMakeLists.txt
@@ -1,3 +1 @@
ADD_GEMRB_PLUGIN (CREImporter CREImporter.cpp)
-
-INSTALL( TARGETS CREImporter DESTINATION ${PLUGIN_INSTALL_DIR} )
diff --git a/gemrb/plugins/DLGImporter/CMakeLists.txt b/gemrb/plugins/DLGImporter/CMakeLists.txt
index 155ad1a..b038852 100644
--- a/gemrb/plugins/DLGImporter/CMakeLists.txt
+++ b/gemrb/plugins/DLGImporter/CMakeLists.txt
@@ -1,3 +1 @@
ADD_GEMRB_PLUGIN (DLGImporter DLGImporter.cpp)
-
-INSTALL( TARGETS DLGImporter DESTINATION ${PLUGIN_INSTALL_DIR} )
diff --git a/gemrb/plugins/DirectoryImporter/CMakeLists.txt b/gemrb/plugins/DirectoryImporter/CMakeLists.txt
index 8693cac..bc673bc 100644
--- a/gemrb/plugins/DirectoryImporter/CMakeLists.txt
+++ b/gemrb/plugins/DirectoryImporter/CMakeLists.txt
@@ -1,3 +1 @@
ADD_GEMRB_PLUGIN (DirectoryImporter DirectoryImporter.cpp)
-
-INSTALL( TARGETS DirectoryImporter DESTINATION ${PLUGIN_INSTALL_DIR} )
diff --git a/gemrb/plugins/EFFImporter/CMakeLists.txt b/gemrb/plugins/EFFImporter/CMakeLists.txt
index c148310..ea37f7a 100644
--- a/gemrb/plugins/EFFImporter/CMakeLists.txt
+++ b/gemrb/plugins/EFFImporter/CMakeLists.txt
@@ -1,3 +1 @@
ADD_GEMRB_PLUGIN (EFFImporter EFFImporter.cpp)
-
-INSTALL( TARGETS EFFImporter DESTINATION ${PLUGIN_INSTALL_DIR} )
diff --git a/gemrb/plugins/FXOpcodes/CMakeLists.txt b/gemrb/plugins/FXOpcodes/CMakeLists.txt
index 0c48ec0..ece46e7 100644
--- a/gemrb/plugins/FXOpcodes/CMakeLists.txt
+++ b/gemrb/plugins/FXOpcodes/CMakeLists.txt
@@ -1,3 +1 @@
ADD_GEMRB_PLUGIN (FXOpcodes FXOpcodes.cpp)
-
-INSTALL( TARGETS FXOpcodes DESTINATION ${PLUGIN_INSTALL_DIR} )
diff --git a/gemrb/plugins/GAMImporter/CMakeLists.txt b/gemrb/plugins/GAMImporter/CMakeLists.txt
index dd01f84..d84052b 100644
--- a/gemrb/plugins/GAMImporter/CMakeLists.txt
+++ b/gemrb/plugins/GAMImporter/CMakeLists.txt
@@ -1,3 +1 @@
ADD_GEMRB_PLUGIN (GAMImporter GAMImporter.cpp)
-
-INSTALL( TARGETS GAMImporter DESTINATION ${PLUGIN_INSTALL_DIR} )
diff --git a/gemrb/plugins/GUIScript/CMakeLists.txt b/gemrb/plugins/GUIScript/CMakeLists.txt
index bc8ab60..1116316 100644
--- a/gemrb/plugins/GUIScript/CMakeLists.txt
+++ b/gemrb/plugins/GUIScript/CMakeLists.txt
@@ -3,5 +3,3 @@ INCLUDE(FindPythonLibs)
INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH})
ADD_GEMRB_PLUGIN (GUIScript GUIScript.cpp)
TARGET_LINK_LIBRARIES( GUIScript ${PYTHON_LIBRARIES} )
-
-INSTALL( TARGETS GUIScript DESTINATION ${PLUGIN_INSTALL_DIR} )
diff --git a/gemrb/plugins/IDSImporter/CMakeLists.txt b/gemrb/plugins/IDSImporter/CMakeLists.txt
index 61e83e9..6615c51 100644
--- a/gemrb/plugins/IDSImporter/CMakeLists.txt
+++ b/gemrb/plugins/IDSImporter/CMakeLists.txt
@@ -1,3 +1 @@
ADD_GEMRB_PLUGIN (IDSImporter IDSImporter.cpp)
-
-INSTALL( TARGETS IDSImporter DESTINATION ${PLUGIN_INSTALL_DIR} )
diff --git a/gemrb/plugins/INIImporter/CMakeLists.txt b/gemrb/plugins/INIImporter/CMakeLists.txt
index a348527..e848597 100644
--- a/gemrb/plugins/INIImporter/CMakeLists.txt
+++ b/gemrb/plugins/INIImporter/CMakeLists.txt
@@ -1,3 +1 @@
ADD_GEMRB_PLUGIN (INIImporter INIImporter.cpp)
-
-INSTALL( TARGETS INIImporter DESTINATION ${PLUGIN_INSTALL_DIR} )
diff --git a/gemrb/plugins/ITMImporter/CMakeLists.txt b/gemrb/plugins/ITMImporter/CMakeLists.txt
index eb6ccad..e3fbda6 100644
--- a/gemrb/plugins/ITMImporter/CMakeLists.txt
+++ b/gemrb/plugins/ITMImporter/CMakeLists.txt
@@ -1,3 +1 @@
ADD_GEMRB_PLUGIN (ITMImporter ITMImporter.cpp)
-
-INSTALL( TARGETS ITMImporter DESTINATION ${PLUGIN_INSTALL_DIR} )
diff --git a/gemrb/plugins/IWDOpcodes/CMakeLists.txt b/gemrb/plugins/IWDOpcodes/CMakeLists.txt
index b41fd71..f544dd4 100644
--- a/gemrb/plugins/IWDOpcodes/CMakeLists.txt
+++ b/gemrb/plugins/IWDOpcodes/CMakeLists.txt
@@ -1,3 +1 @@
ADD_GEMRB_PLUGIN (IWDOpcodes IWDOpcodes.cpp)
-
-INSTALL( TARGETS IWDOpcodes DESTINATION ${PLUGIN_INSTALL_DIR} )
diff --git a/gemrb/plugins/KEYImporter/CMakeLists.txt b/gemrb/plugins/KEYImporter/CMakeLists.txt
index 5f9b045..de14082 100644
--- a/gemrb/plugins/KEYImporter/CMakeLists.txt
+++ b/gemrb/plugins/KEYImporter/CMakeLists.txt
@@ -1,3 +1 @@
ADD_GEMRB_PLUGIN (KEYImporter KEYImporter.cpp Dictionary.cpp)
-
-INSTALL( TARGETS KEYImporter DESTINATION ${PLUGIN_INSTALL_DIR} )
diff --git a/gemrb/plugins/MOSImporter/CMakeLists.txt b/gemrb/plugins/MOSImporter/CMakeLists.txt
index 892c658..d3ae969 100644
--- a/gemrb/plugins/MOSImporter/CMakeLists.txt
+++ b/gemrb/plugins/MOSImporter/CMakeLists.txt
@@ -1,3 +1 @@
ADD_GEMRB_PLUGIN (MOSImporter MOSImporter.cpp)
-
-INSTALL( TARGETS MOSImporter DESTINATION ${PLUGIN_INSTALL_DIR} )
diff --git a/gemrb/plugins/MUSImporter/CMakeLists.txt b/gemrb/plugins/MUSImporter/CMakeLists.txt
index feae5b3..46f6126 100644
--- a/gemrb/plugins/MUSImporter/CMakeLists.txt
+++ b/gemrb/plugins/MUSImporter/CMakeLists.txt
@@ -1,3 +1 @@
ADD_GEMRB_PLUGIN (MUSImporter MUSImporter.cpp)
-
-INSTALL( TARGETS MUSImporter DESTINATION ${PLUGIN_INSTALL_DIR} )
diff --git a/gemrb/plugins/MVEPlayer/CMakeLists.txt b/gemrb/plugins/MVEPlayer/CMakeLists.txt
index 656695c..524f956 100644
--- a/gemrb/plugins/MVEPlayer/CMakeLists.txt
+++ b/gemrb/plugins/MVEPlayer/CMakeLists.txt
@@ -1,3 +1 @@
ADD_GEMRB_PLUGIN ( MVEPlayer mvevideodec8.cpp mvevideodec16.cpp mveaudiodec.cpp mve_player.cpp MVEPlayer.cpp )
-
-INSTALL( TARGETS MVEPlayer DESTINATION ${PLUGIN_INSTALL_DIR} )
diff --git a/gemrb/plugins/NullSound/CMakeLists.txt b/gemrb/plugins/NullSound/CMakeLists.txt
index dcec350..93c49ba 100644
--- a/gemrb/plugins/NullSound/CMakeLists.txt
+++ b/gemrb/plugins/NullSound/CMakeLists.txt
@@ -1,3 +1 @@
ADD_GEMRB_PLUGIN (NullSound NullSound.cpp )
-
-INSTALL( TARGETS NullSound DESTINATION ${PLUGIN_INSTALL_DIR} )
diff --git a/gemrb/plugins/OpenALAudio/CMakeLists.txt b/gemrb/plugins/OpenALAudio/CMakeLists.txt
index 970bf88..edd6155 100644
--- a/gemrb/plugins/OpenALAudio/CMakeLists.txt
+++ b/gemrb/plugins/OpenALAudio/CMakeLists.txt
@@ -4,5 +4,4 @@ INCLUDE_DIRECTORIES(${OPENAL_INCLUDE_DIR} ${SDL_INCLUDE_DIR} )
FILE( GLOB OpenALAudio_files *.cpp )
ADD_GEMRB_PLUGIN (OpenALAudio ${OpenALAudio_files} )
TARGET_LINK_LIBRARIES(OpenALAudio ${OPENAL_LIBRARY} ${SDL_LIBRARY} )
-INSTALL( TARGETS OpenALAudio DESTINATION ${PLUGIN_INSTALL_DIR} )
ENDIF(OPENAL_FOUND)
diff --git a/gemrb/plugins/PLTImporter/CMakeLists.txt b/gemrb/plugins/PLTImporter/CMakeLists.txt
index a2b6ff2..f89f98c 100644
--- a/gemrb/plugins/PLTImporter/CMakeLists.txt
+++ b/gemrb/plugins/PLTImporter/CMakeLists.txt
@@ -1,3 +1 @@
ADD_GEMRB_PLUGIN (PLTImporter PLTImporter.cpp)
-
-INSTALL( TARGETS PLTImporter DESTINATION ${PLUGIN_INSTALL_DIR} )
diff --git a/gemrb/plugins/PNGImporter/CMakeLists.txt b/gemrb/plugins/PNGImporter/CMakeLists.txt
index 417a622..85ded28 100644
--- a/gemrb/plugins/PNGImporter/CMakeLists.txt
+++ b/gemrb/plugins/PNGImporter/CMakeLists.txt
@@ -2,5 +2,4 @@ IF(PNG_FOUND)
INCLUDE_DIRECTORIES( ${PNG_INCLUDE_DIR} )
ADD_GEMRB_PLUGIN (PNGImporter PNGImporter.cpp)
TARGET_LINK_LIBRARIES( PNGImporter ${PNG_LIBRARY} )
-INSTALL( TARGETS PNGImporter DESTINATION ${PLUGIN_INSTALL_DIR} )
ENDIF( PNG_FOUND )
diff --git a/gemrb/plugins/PROImporter/CMakeLists.txt b/gemrb/plugins/PROImporter/CMakeLists.txt
index c115eec..ca50753 100644
--- a/gemrb/plugins/PROImporter/CMakeLists.txt
+++ b/gemrb/plugins/PROImporter/CMakeLists.txt
@@ -1,3 +1 @@
ADD_GEMRB_PLUGIN (PROImporter PROImporter.cpp)
-
-INSTALL( TARGETS PROImporter DESTINATION ${PLUGIN_INSTALL_DIR} )
diff --git a/gemrb/plugins/PSTOpcodes/CMakeLists.txt b/gemrb/plugins/PSTOpcodes/CMakeLists.txt
index 5ea96ce..5abb577 100644
--- a/gemrb/plugins/PSTOpcodes/CMakeLists.txt
+++ b/gemrb/plugins/PSTOpcodes/CMakeLists.txt
@@ -1,3 +1 @@
ADD_GEMRB_PLUGIN (PSTOpcodes PSTOpcodes.cpp)
-
-INSTALL( TARGETS PSTOpcodes DESTINATION ${PLUGIN_INSTALL_DIR} )
diff --git a/gemrb/plugins/SDLVideo/CMakeLists.txt b/gemrb/plugins/SDLVideo/CMakeLists.txt
index 270d681..867918e 100644
--- a/gemrb/plugins/SDLVideo/CMakeLists.txt
+++ b/gemrb/plugins/SDLVideo/CMakeLists.txt
@@ -2,5 +2,3 @@ INCLUDE_DIRECTORIES( ${SDL_INCLUDE_DIR} )
ADD_GEMRB_PLUGIN (SDLVideo SDLVideo.cpp)
TARGET_LINK_LIBRARIES( SDLVideo ${SDL_LIBRARY} )
-
-INSTALL( TARGETS SDLVideo DESTINATION ${PLUGIN_INSTALL_DIR} )
diff --git a/gemrb/plugins/SPLImporter/CMakeLists.txt b/gemrb/plugins/SPLImporter/CMakeLists.txt
index 7f4425a..a76b78b 100644
--- a/gemrb/plugins/SPLImporter/CMakeLists.txt
+++ b/gemrb/plugins/SPLImporter/CMakeLists.txt
@@ -1,3 +1 @@
ADD_GEMRB_PLUGIN (SPLImporter SPLImporter.cpp)
-
-INSTALL( TARGETS SPLImporter DESTINATION ${PLUGIN_INSTALL_DIR} )
diff --git a/gemrb/plugins/STOImporter/CMakeLists.txt b/gemrb/plugins/STOImporter/CMakeLists.txt
index a3de36e..78e57d5 100644
--- a/gemrb/plugins/STOImporter/CMakeLists.txt
+++ b/gemrb/plugins/STOImporter/CMakeLists.txt
@@ -1,3 +1 @@
ADD_GEMRB_PLUGIN (STOImporter STOImporter.cpp)
-
-INSTALL( TARGETS STOImporter DESTINATION ${PLUGIN_INSTALL_DIR} )
diff --git a/gemrb/plugins/TISImporter/CMakeLists.txt b/gemrb/plugins/TISImporter/CMakeLists.txt
index 6c1aae2..2ceea26 100644
--- a/gemrb/plugins/TISImporter/CMakeLists.txt
+++ b/gemrb/plugins/TISImporter/CMakeLists.txt
@@ -1,3 +1 @@
ADD_GEMRB_PLUGIN (TISImporter TISImporter.cpp)
-
-INSTALL( TARGETS TISImporter DESTINATION ${PLUGIN_INSTALL_DIR} )
diff --git a/gemrb/plugins/TLKImporter/CMakeLists.txt b/gemrb/plugins/TLKImporter/CMakeLists.txt
index 7684908..6628d21 100644
--- a/gemrb/plugins/TLKImporter/CMakeLists.txt
+++ b/gemrb/plugins/TLKImporter/CMakeLists.txt
@@ -1,3 +1 @@
ADD_GEMRB_PLUGIN (TLKImporter TLKImporter.cpp TlkOverride.cpp)
-
-INSTALL( TARGETS TLKImporter DESTINATION ${PLUGIN_INSTALL_DIR} )
diff --git a/gemrb/plugins/WEDImporter/CMakeLists.txt b/gemrb/plugins/WEDImporter/CMakeLists.txt
index 8f96fb9..349c7f7 100644
--- a/gemrb/plugins/WEDImporter/CMakeLists.txt
+++ b/gemrb/plugins/WEDImporter/CMakeLists.txt
@@ -1,3 +1 @@
ADD_GEMRB_PLUGIN (WEDImporter WEDImporter.cpp)
-
-INSTALL( TARGETS WEDImporter DESTINATION ${PLUGIN_INSTALL_DIR} )
diff --git a/gemrb/plugins/WMPImporter/CMakeLists.txt b/gemrb/plugins/WMPImporter/CMakeLists.txt
index 29894bc..7ad075b 100644
--- a/gemrb/plugins/WMPImporter/CMakeLists.txt
+++ b/gemrb/plugins/WMPImporter/CMakeLists.txt
@@ -1,3 +1 @@
ADD_GEMRB_PLUGIN (WMPImporter WMPImporter.cpp)
-
-INSTALL( TARGETS WMPImporter DESTINATION ${PLUGIN_INSTALL_DIR} )
diff --git a/gemrb/plugins/ZLibManager/CMakeLists.txt b/gemrb/plugins/ZLibManager/CMakeLists.txt
index 1ef46d2..59bbb09 100644
--- a/gemrb/plugins/ZLibManager/CMakeLists.txt
+++ b/gemrb/plugins/ZLibManager/CMakeLists.txt
@@ -1,4 +1,2 @@
ADD_GEMRB_PLUGIN (ZLibMgr ZLibManager.cpp)
TARGET_LINK_LIBRARIES( ZLibMgr ${ZLIB_LIBRARY} )
-
-INSTALL(TARGETS ZLibMgr DESTINATION ${PLUGIN_INSTALL_DIR} )
-----------------------------------------------------------------------
This is an automated email from the git hooks/post-receive script.
--
gemrb: Infinity Engine emulator
|