summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
diff options
context:
space:
mode:
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt10
1 files changed, 7 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3c8aa509..afc6ab69 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,10 @@
-PROJECT(TMW)
+PROJECT(AETHYRA)
+<<<<<<< HEAD:CMakeLists.txt
+SET(VERSION 0.0.27)
+=======
SET(VERSION 0.0.26)
+>>>>>>> a7c21e6f8add37af7412449742ec55c8daa8571a:CMakeLists.txt
# where to look for cmake modules
SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMake/Modules)
@@ -11,11 +15,11 @@ IF (WIN32)
SET(PKG_DATADIR ".")
SET(PKG_BINDIR ".")
ELSE (WIN32)
- SET(PKG_DATADIR ${CMAKE_INSTALL_PREFIX}/share/tmw)
+ SET(PKG_DATADIR ${CMAKE_INSTALL_PREFIX}/share/aethyra)
SET(PKG_BINDIR ${CMAKE_INSTALL_PREFIX}/bin)
ENDIF (WIN32)
ADD_SUBDIRECTORY(data)
ADD_SUBDIRECTORY(src)
-INSTALL(FILES tmw.desktop DESTINATION share/applications)
+INSTALL(FILES aethyra.desktop DESTINATION share/applications)