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

List:       kde-commits
Subject:    [kmymoney] /: Fixed some problems in the build system
From:       Christian_Dávid <christian-david () web ! de>
Date:       2016-07-31 19:39:50
Message-ID: E1bTwaU-0001ZQ-Hy () code ! kde ! org
[Download RAW message or body]

Git commit 7865fff1e566fae22eda5e29137d333cba87e0a8 by Christian D=C3=A1vid.
Committed on 30/07/2016 at 21:21.
Pushed by christiand into branch 'master'.

Fixed some problems in the build system

Removed unused not working commands and some unused variables.
Replaced some depricated variables.

M  +0    -4    CMakeLists.txt
M  +0    -1    kmymoney/CMakeLists.txt
M  +1    -6    kmymoney/dialogs/CMakeLists.txt
M  +0    -7    kmymoney/dialogs/settings/CMakeLists.txt
M  +1    -1    kmymoney/mymoney/CMakeLists.txt
M  +1    -1    kmymoney/mymoney/payeeidentifier/CMakeLists.txt

http://commits.kde.org/kmymoney/7865fff1e566fae22eda5e29137d333cba87e0a8

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2310cd4..f9e9170 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,10 +4,6 @@ cmake_minimum_required(VERSION 3.1)
 # Setting the name of the main project
 project(KMyMoney VERSION "4.100.0")
 =

-# The current version of KMyMoney (used for backwards compitibility, depri=
cated since 5.0)
-set(VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
-set(VERSION_MINOR ${PROJECT_VERSION_MINOR})
-set(VERSION_PATCH ${PROJECT_VERSION_PATCH})
 =

 # Determine the GIT reference (if we're based on GIT)
 if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git")
diff --git a/kmymoney/CMakeLists.txt b/kmymoney/CMakeLists.txt
index a4ffda1..00ffec0 100644
--- a/kmymoney/CMakeLists.txt
+++ b/kmymoney/CMakeLists.txt
@@ -2,7 +2,6 @@ include(ECMAddAppIcon)
 =

 include_directories(${CMAKE_CURRENT_SOURCE_DIR}
                     ${CMAKE_CURRENT_BINARY_DIR}
-                    ${KDEPIMLIBS_INCLUDE_DIRS}
                     ${CMAKE_CURRENT_BINARY_DIR}/dialogs/
                     ${CMAKE_CURRENT_SOURCE_DIR}/widgets/
                     ${CMAKE_CURRENT_BINARY_DIR}/widgets/
diff --git a/kmymoney/dialogs/CMakeLists.txt b/kmymoney/dialogs/CMakeLists.=
txt
index ba9f3dd..316ed63 100644
--- a/kmymoney/dialogs/CMakeLists.txt
+++ b/kmymoney/dialogs/CMakeLists.txt
@@ -74,12 +74,7 @@ set(dialogs_UI
 =

 ki18n_wrap_ui(libdialogs_a_SOURCES ${dialogs_UI} )
 =

-# in order to use add_dependencies, we need to add this custom target
-# for all generated header files.
-# (see http://www.vtk.org/Wiki/CMake_FAQ#How_can_I_add_a_dependency_to_a_s=
ource_file_which_is_generated_in_a_subdirectory.3F )
-add_custom_target(generate_dialogs_ui_srcs DEPENDS ${dialogs_ui_srcs})
-
-add_library(dialogs STATIC ${libdialogs_a_SOURCES} ${dialogs_ui_srcs})
+add_library(dialogs STATIC ${libdialogs_a_SOURCES})
 =

 target_link_libraries(dialogs
   PUBLIC
diff --git a/kmymoney/dialogs/settings/CMakeLists.txt b/kmymoney/dialogs/se=
ttings/CMakeLists.txt
index 30cfd6a..d168710 100644
--- a/kmymoney/dialogs/settings/CMakeLists.txt
+++ b/kmymoney/dialogs/settings/CMakeLists.txt
@@ -1,12 +1,5 @@
-add_custom_command(
-  OUTPUT ${KMyMoney2_BINARY_DIR}/kmymoneysettings.h  ${KMyMoney2_BINARY_DI=
R}/kmymoneysettings.cpp
-  DEPENDS ${KMyMoney2_SOURCE_DIR}/kmymoney.kcfg ${KMyMoney2_SOURCE_DIR}/km=
ymoneysettings.kcfgc
-  COMMAND ${KDE4_KCFGC_EXECUTABLE} -d ${KMyMoney2_BINARY_DIR}/ ${KMyMoney2=
_SOURCE_DIR}/kmymoney.kcfg ${KMyMoney2_SOURCE_DIR}/kmymoneysettings.kcfgc
-  )
-
 =

 set (libsettings_a_SOURCES
-  ${KMyMoney2_BINARY_DIR}/kmymoneysettings.h
   ksettingscolors.cpp
   ksettingsfonts.cpp
   ksettingsforecast.cpp
diff --git a/kmymoney/mymoney/CMakeLists.txt b/kmymoney/mymoney/CMakeLists.=
txt
index 6103f4b..33b6177 100644
--- a/kmymoney/mymoney/CMakeLists.txt
+++ b/kmymoney/mymoney/CMakeLists.txt
@@ -83,7 +83,7 @@ set_target_properties(kmm_mymoney PROPERTIES VERSION ${PR=
OJECT_VERSION} SOVERSIO
 ########### install files ###############
 =

 install(TARGETS kmm_mymoney
-  ${INSTALL_TARGETS_DEFAULT_ARGS} )
+  ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
 =

 install(FILES ${mymoney_HEADERS}
   DESTINATION ${INCLUDE_INSTALL_DIR}/kmymoney COMPONENT Devel)
diff --git a/kmymoney/mymoney/payeeidentifier/CMakeLists.txt b/kmymoney/mym=
oney/payeeidentifier/CMakeLists.txt
index f0b3625..fbc7761 100644
--- a/kmymoney/mymoney/payeeidentifier/CMakeLists.txt
+++ b/kmymoney/mymoney/payeeidentifier/CMakeLists.txt
@@ -27,7 +27,7 @@ target_include_directories( kmm_payeeidentifier PUBLIC
 )
 =

 install( TARGETS kmm_payeeidentifier
-  ${INSTALL_TARGETS_DEFAULT_ARGS})
+  ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 =

 ## Plugin loader
 =


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