[Performous-commit] Lasse Karkkainen : Remove launcher script, install binary as bin/performous

[Lasse Kärkkäi. <tr...@us...>]

Module: performous
Branch: master
Commit: c3d60a4497c2cef29e2a969a31dc3ed8e096ef0b

Author: Lasse Karkkainen <tro...@tr...>
Date:   Wed Nov 11 21:56:03 2009 +0200

Remove launcher script, install binary as bin/performous

---

 CMakeLists.txt      |    9 ---------
 game/CMakeLists.txt |    9 +++++----
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index efeac79..ad4d399 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,12 +49,3 @@ if (ENABLE_TOOLS)
   add_subdirectory(tools)
 endif (ENABLE_TOOLS)
 
-set(FULL_PREFIX ${CMAKE_INSTALL_PREFIX})
-if(UNIX AND NOT "${FULL_PREFIX}" MATCHES "^/")
-  set(FULL_PREFIX "${CMAKE_BINARY_DIR}/${FULL_PREFIX}")
-endif(UNIX AND NOT "${FULL_PREFIX}" MATCHES "^/")
-set(PERFORMOUS_PLUGIN_PATH "${FULL_PREFIX}/lib${LIB_SUFFIX}/libda")
-set(PERFORMOUS_EXECUTABLE "${FULL_PREFIX}/bin/performous.bin")
-configure_file("${PROJECT_SOURCE_DIR}/cmake/performous.sh.cmake" "${PROJECT_BINARY_DIR}/performous" ESCAPE_QUOTES @ONLY)
-install(PROGRAMS "${PROJECT_BINARY_DIR}/performous" DESTINATION bin)
-install(SCRIPT "${PROJECT_SOURCE_DIR}/cmake/performous-launcher.cmake")
diff --git a/game/CMakeLists.txt b/game/CMakeLists.txt
index d105f0d..83168b6 100644
--- a/game/CMakeLists.txt
+++ b/game/CMakeLists.txt
@@ -35,10 +35,11 @@ if(CMAKE_COMPILER_IS_GNUCXX)
 	add_definitions("-D__STDC_CONSTANT_MACROS")
 endif(CMAKE_COMPILER_IS_GNUCXX)
 
-add_executable(performous.bin ${SOURCES} ${SDL_SOURCES})
-target_link_libraries(performous.bin da ${LIBS})
+add_executable(performous ${SOURCES} ${SDL_SOURCES})
+target_link_libraries(performous da ${LIBS})
 
-set_target_properties(performous.bin PROPERTIES
+# Store library paths in executable
+set_target_properties(performous PROPERTIES
 	INSTALL_RPATH_USE_LINK_PATH TRUE
 	SKIP_BUILD_RPATH FALSE
 	INSTALL_RPATH \$ORIGIN/../lib
@@ -49,5 +50,5 @@ set_target_properties(performous.bin PROPERTIES
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/config.cmake.hh" "${CMAKE_CURRENT_BINARY_DIR}/config.hh" @ONLY)
 include_directories("${CMAKE_CURRENT_BINARY_DIR}")
 
-install(TARGETS performous.bin DESTINATION bin)
+install(TARGETS performous DESTINATION bin)