cmake/makefile: there is no need for MAJOR/MINOR/PATCH anymore

[xonotic/netradiant.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bd5dab6ce95cb28151b060eb801c3083e48bcca5..e5d7f7746a4d5e84fbfbe1c6a8c3e67b1084a66c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -142,11 +142,6 @@ endif ()
 
 if (BUILD_BINARIES)
     add_definitions(-DRADIANT_VERSION="${RADIANT_VERSION}")
-    add_definitions(-DRADIANT_MAJOR_VERSION="${RADIANT_VERSION_MAJOR}")
-    add_definitions(-DRADIANT_MINOR_VERSION="${RADIANT_VERSION_MINOR}")
-    add_definitions(-DRADIANT_PATCH_VERSION="${RADIANT_VERSION_PATCH}")
-
-    add_definitions(-DRADIANT_ABOUTMSG="${RADIANT_ABOUTMSG}")
 
     if (NOT CMAKE_BUILD_TYPE MATCHES Release)
         add_definitions(-D_DEBUG=1)
@@ -154,6 +149,8 @@ if (BUILD_BINARIES)
 endif ()
 
 if (BUILD_RADIANT)
+    add_definitions(-DRADIANT_ABOUTMSG="${RADIANT_ABOUTMSG}")
+
     macro (disable_deprecated name gtk2only)
         add_definitions(-D${name}_DISABLE_SINGLE_INCLUDES)
         if ((${gtk2only} EQUAL 0) OR (GTK_TARGET EQUAL 2))
@@ -290,7 +287,7 @@ if (BUILD_BINARIES)
     endmacro ()
 
     if (BUILD_RADIANT)
-        add_subdirectory(radiant _radiant)
+        add_subdirectory(radiant)
         set_target_properties(${RADIANT_BASENAME} PROPERTIES
         COMPILE_DEFINITIONS RADIANT_EXECUTABLE="${RADIANT_EXECUTABLE}"
     )