[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdegames
From:       Parker Coates <parker.coates () gmail ! com>
Date:       2009-03-01 20:29:08
Message-ID: 1235939348.312823.29398.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 933873 by coates:

Minor reordering, consistency and cleanup of CMake file.


 M  +18 -21    CMakeLists.txt  


--- trunk/KDE/kdegames/CMakeLists.txt #933872:933873
@@ -1,6 +1,6 @@
 project(kdegames)
 
-set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules )
+set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
 
 # search packages used by KDE
 find_package(KDE4 REQUIRED)
@@ -17,13 +17,12 @@
 macro_optional_find_package(QCA2)
 macro_log_feature(QCA2_FOUND "QCA2" "Qt Cryptographic Architecture" \
"http://delta.affinix.com/qca" FALSE "2.0.0" "Needed to build Ksirk Jabber support's \
GroupWise and Jabberprotocols.")  
-
 macro_optional_find_package(OpenGL)
 macro_log_feature(OPENGL_FOUND "OpenGL" "API for developing portable, interactive 2D \
and 3Dgraphics applications" "http://mesa3d.sourceforge.net" FALSE "" "Kubrick will \
not be built and KSudoku will not have Roxdoku support without OpenGL.")  \
macro_log_feature(QT_QTOPENGL_FOUND "QtOpenGL" "Qt module that make it easy to use \
OpenGL in Qt apps" "http://doc.trolltech.com/latest/qtopengl.html" FALSE "" "Kubrick \
will not be built and KSudoku will not have Roxdoku support without QtOpenGL.")  
 if(OPENGL_FOUND AND QT_QTOPENGL_FOUND)
-	set(OPENGL_SUPPORT true)
+    set(OPENGL_SUPPORT true)
 endif(OPENGL_FOUND AND QT_QTOPENGL_FOUND)
 
 add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
@@ -33,13 +32,13 @@
 set(HIGHSCORE_DIRECTORY "" CACHE STRING "Where to install system-wide highscores \
e.g. /var/games")  
 if(WIN32)
-  # detect oxygen icon dir at configure time based on KDEDIRS - there may be \
                different package installation locations
-  execute_process(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path icon OUTPUT_VARIABLE \
                _dir ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
-  file(TO_CMAKE_PATH "${_dir}" __dir)
-  find_path(KDE4_ICON_DIR oxygen PATHS
-      ${__dir}
-  )
-  message(STATUS "using oxygen application icons from ${KDE4_ICON_DIR}")
+    # detect oxygen icon dir at configure time based on KDEDIRS - there may be \
different package installation locations +    execute_process(COMMAND \
"${KDE4_KDECONFIG_EXECUTABLE}" --path icon OUTPUT_VARIABLE _dir ERROR_QUIET \
OUTPUT_STRIP_TRAILING_WHITESPACE) +    file(TO_CMAKE_PATH "${_dir}" __dir)
+    find_path(KDE4_ICON_DIR oxygen PATHS
+        ${__dir}
+    )
+    message(STATUS "using oxygen application icons from ${KDE4_ICON_DIR}")
 else(WIN32)
     set (KDE4_ICON_DIR  ${CMAKE_INSTALL_PREFIX}/share/icons)
 endif(WIN32)
@@ -48,8 +47,10 @@
 add_subdirectory(libkdegames)
 add_subdirectory(libkmahjongg)
 
+macro_optional_add_subdirectory(bomber)
 macro_optional_add_subdirectory(bovo)
 macro_optional_add_subdirectory(lskat)
+macro_optional_add_subdirectory(kapman)
 macro_optional_add_subdirectory(katomic)
 macro_optional_add_subdirectory(kbattleship)
 macro_optional_add_subdirectory(kblackbox)
@@ -73,22 +74,18 @@
 macro_optional_add_subdirectory(kreversi)
 macro_optional_add_subdirectory(ksame)
 macro_optional_add_subdirectory(kshisen)
-macro_optional_add_subdirectory(ktron)
-if (QCA2_FOUND)
-  macro_optional_add_subdirectory(ksirk)
-endif (QCA2_FOUND)
+if(QCA2_FOUND)
+    macro_optional_add_subdirectory(ksirk)
+endif(QCA2_FOUND)
 macro_optional_add_subdirectory(kspaceduel)
 macro_optional_add_subdirectory(ksquares)
-macro_optional_add_subdirectory(ktuberling)
 macro_optional_add_subdirectory(ksudoku)
-macro_optional_add_subdirectory(kapman)
-macro_optional_add_subdirectory(bomber)
+macro_optional_add_subdirectory(ktuberling)
+macro_optional_add_subdirectory(ktron)
 if(OPENGL_SUPPORT)
-  macro_optional_add_subdirectory(kubrick)
+    macro_optional_add_subdirectory(kubrick)
 endif(OPENGL_SUPPORT)
-add_subdirectory( cmake )
 
+add_subdirectory(cmake)
 
-
 macro_display_feature_log()
-


[prev in list] [next in list] [prev in thread] [next in thread]