diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2009-06-28 23:14:33 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2009-06-28 23:14:33 +0200 |
| commit | c6f664ab7f5d474a6b080d091e7e8004f66e651e (patch) | |
| tree | 8715fd7006f97c9d8c28d46c1d97ecd423801ade /src | |
| parent | Fixing popup pos && removing unwanted statusBar (diff) | |
| download | rekonq-c6f664ab7f5d474a6b080d091e7e8004f66e651e.tar.xz | |
Fixing silly conditions on CMakeLists KDE version
check
BUG: 198004
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 32 |
1 files changed, 11 insertions, 21 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ed3205b8..809e54af 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,14 +1,10 @@ ### ------- SETTING REKONQ FILES.. -if(${KDE_VERSION_MINOR} EQUAL "2" AND ${KDE_VERSION_RELEASE} GREATER "69") - -SET( rekonq_NAM networkmanager.cpp ) - -else(${KDE_VERSION_MINOR} EQUAL "2" AND ${KDE_VERSION_RELEASE} GREATER "69") - -SET( rekonq_NAM kaccessmanager.cpp ) - -endif(${KDE_VERSION_MINOR} EQUAL "2" AND ${KDE_VERSION_RELEASE} GREATER "69") +if(KDE_OLD_VERSION) + SET( rekonq_NAM kaccessmanager.cpp ) +else(KDE_OLD_VERSION) + SET( rekonq_NAM networkmanager.cpp ) +endif(KDE_OLD_VERSION) SET( rekonq_SRCS ${rekonq_NAM} @@ -66,13 +62,11 @@ INCLUDE_DIRECTORIES ( ${CMAKE_CURRENT_SOURCE_DIR} ${KDEWEBKIT_INCLUDE_DIR} ) -if(${KDE_VERSION_MINOR} EQUAL "2" AND ${KDE_VERSION_RELEASE} GREATER "69") -else(${KDE_VERSION_MINOR} EQUAL "2" AND ${KDE_VERSION_RELEASE} GREATER "69") +if(KDE_OLD_VERSION) INCLUDE_DIRECTORIES( ${KDENETWORK_INCLUDE_DIR} ) -endif(${KDE_VERSION_MINOR} EQUAL "2" AND ${KDE_VERSION_RELEASE} GREATER "69") - +endif(KDE_OLD_VERSION) ### -------------- ADDING DEFINITIONS... @@ -81,13 +75,11 @@ ADD_DEFINITIONS ( ${KDE4_DEFINITIONS} ${KDEWEBKIT_DEFINITIONS} ) -if(${KDE_VERSION_MINOR} EQUAL "2" AND ${KDE_VERSION_RELEASE} GREATER "69") -else(${KDE_VERSION_MINOR} EQUAL "2" AND ${KDE_VERSION_RELEASE} GREATER "69") +if(KDE_OLD_VERSION) ADD_DEFINITIONS ( ${KDENETWORK_DEFINITIONS} ) -endif(${KDE_VERSION_MINOR} EQUAL "2" AND ${KDE_VERSION_RELEASE} GREATER "69") - +endif(KDE_OLD_VERSION) ### --------------- ADDING EXECUTABLE... @@ -107,13 +99,11 @@ TARGET_LINK_LIBRARIES ( rekonq ${KDEWEBKIT_LIBRARIES} ) -if(${KDE_VERSION_MINOR} EQUAL "2" AND ${KDE_VERSION_RELEASE} GREATER "69") -else(${KDE_VERSION_MINOR} EQUAL "2" AND ${KDE_VERSION_RELEASE} GREATER "69") +if(KDE_OLD_VERSION) TARGET_LINK_LIBRARIES( ${KDENETWORK_LIBRARIES} ) -endif(${KDE_VERSION_MINOR} EQUAL "2" AND ${KDE_VERSION_RELEASE} GREATER "69") - +endif(KDE_OLD_VERSION) ### ------------ INSTALL FILES... |