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

List:       kde-commits
Subject:    KDE/kdegames
From:       Stefan Majewsky <majewsky () gmx ! net>
Date:       2012-05-10 20:20:51
Message-ID: 20120510202051.E684FAC89C () svn ! kde ! org
[Download RAW message or body]

SVN commit 1294013 by majewsky:

Create a FindLibKMahjongg.cmake for split build of KMahjongg and KShisen.

Also, the old FindLibKDEGames.cmake is dropped. This step is crucial for
third-party apps which want to reliably disambiguate the old and new
libkdegames via find_package(LibKDEGames) vs. find_package(KDEGames).

 M  +0 -1      CMakeLists.txt  
 D             cmake/CMakeLists.txt  
 D             cmake/modules/CMakeLists.txt  
 D             cmake/modules/FindLibKDEGames.cmake  
 M  +17 -1     kmahjongg/CMakeLists.txt  
 A             kmahjongg/cmake-modules (directory)  
 A             kmahjongg/cmake-modules/FindLibKMahjongg.cmake  
 M  +16 -0     kshisen/CMakeLists.txt  
 A             kshisen/cmake-modules (directory)  
 A             kshisen/cmake-modules/FindLibKMahjongg.cmake  
 M  +1 -1      kshisen/src/CMakeLists.txt  


--- trunk/KDE/kdegames/CMakeLists.txt #1294012:1294013
@@ -86,6 +86,5 @@
     macro_optional_add_subdirectory(kajongg)
 endif(PYTHONINTERP_FOUND)
 
-add_subdirectory(cmake)
 macro_optional_add_subdirectory(doc)
 macro_display_feature_log()
--- trunk/KDE/kdegames/kmahjongg/CMakeLists.txt #1294012:1294013
@@ -1,5 +1,21 @@
 project(kmahjongg)
 
+if(NOT COMPILING_KDEGAMES)
+	find_package(KDE4 REQUIRED)
+	include(KDE4Defaults)
+	include(MacroLibrary)
+	find_package(KDEGames REQUIRED)
+
+	set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake-modules)
+	find_package(LibKMahjongg REQUIRED)
+
+	add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+	add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
+	include_directories(${QDBUS_INCLUDE_DIRS} ${KDE4_INCLUDES} ${KDEGAMES_INCLUDE_DIRS} ${LIBKMAHJONGG_INCLUDE_DIR})
+else(NOT COMPILING_KDEGAMES)
+	set(LIBKMAHJONGG_LIBRARY kmahjongglib)
+endif(NOT COMPILING_KDEGAMES)
+
 add_subdirectory( layouts )
 
 include_directories( ${CMAKE_SOURCE_DIR}/libkmahjongg  )
@@ -26,7 +42,7 @@
 kde4_add_app_icon(kmahjongg_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/hi*-app-kmahjongg.png")
 kde4_add_executable(kmahjongg ${kmahjongg_SRCS})
 
-target_link_libraries(kmahjongg  ${KDE4_KIO_LIBS} kdegames kdegamesprivate kmahjongglib )
+target_link_libraries(kmahjongg  ${KDE4_KIO_LIBS} kdegames kdegamesprivate ${LIBKMAHJONGG_LIBRARY} )
 
 install(TARGETS kmahjongg  ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
--- trunk/KDE/kdegames/kshisen/CMakeLists.txt #1294012:1294013
@@ -1,5 +1,21 @@
 project( kshisen )
 
+if(NOT COMPILING_KDEGAMES)
+	find_package(KDE4 REQUIRED)
+	include(KDE4Defaults)
+	include(MacroLibrary)
+	find_package(KDEGames REQUIRED)
+
+	set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake-modules)
+	find_package(LibKMahjongg REQUIRED)
+
+	add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+	add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
+	include_directories(${QDBUS_INCLUDE_DIRS} ${KDE4_INCLUDES} ${KDEGAMES_INCLUDE_DIRS} ${LIBKMAHJONGG_INCLUDE_DIR})
+else(NOT COMPILING_KDEGAMES)
+	set(LIBKMAHJONGG_LIBRARY kmahjongglib)
+endif(NOT COMPILING_KDEGAMES)
+
 add_subdirectory( src )
 add_subdirectory( sounds )
 
--- trunk/KDE/kdegames/kshisen/src/CMakeLists.txt #1294012:1294013
@@ -18,7 +18,7 @@
 
 kde4_add_executable( kshisen ${kshisen_SRCS} )
 
-target_link_libraries( kshisen ${KDE4_KDEUI_LIBS} kdegames kmahjongglib )
+target_link_libraries( kshisen ${KDE4_KDEUI_LIBS} kdegames ${LIBKMAHJONGG_LIBRARY} )
 
 install( TARGETS kshisen ${INSTALL_TARGETS_DEFAULT_ARGS} )
 
[prev in list] [next in list] [prev in thread] [next in thread]