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

List:       kde-commits
Subject:    KDE/kdegraphics/kolourpaint
From:       Christian Ehrlicher <Ch.Ehrlicher () gmx ! de>
Date:       2008-04-21 17:10:25
Message-ID: 1208797825.830782.13943.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 799489 by chehrlic:

the long command line problem with mingw no longer exists and the hack used to \
circumvent this problem does no longer work because cmake 2.6 removes double targets \
                from the list in target_link_libraries()
--> target_link_libraries(foo a b a) becomes target_link_libraries(foo a b) which \
does not work with static libs when they need each other.

CCMAIL: neundorf@kde.org

 M  +3 -3      CMakeLists.txt  


--- trunk/KDE/kdegraphics/kolourpaint/CMakeLists.txt #799488:799489
@@ -100,7 +100,7 @@
 
 # GENERATED BY ./gen_cmake_srcs | fgrep -v /lgpl/
 
-if(MINGW)
+if(CMAKE_MAJOR_VERSION MATCHES "2" AND CMAKE_MINOR_VERSION MATCHES "4" AND MINGW)
 
 set(kolourpaint_lib1_SRCS
 ${CMAKE_CURRENT_SOURCE_DIR}/commands/imagelib/effects/kpEffectBalanceCommand.cpp
@@ -333,7 +333,7 @@
 # doubled for the linker
 set(mingw_libs kolourpaint_lib1 kolourpaint_lib2 kolourpaint_lib1 kolourpaint_lib2)
 
-else(MINGW)
+else(CMAKE_MAJOR_VERSION MATCHES "2" AND CMAKE_MINOR_VERSION MATCHES "4" AND MINGW)
 
 set(kolourpaint_SRCS
 
@@ -556,7 +556,7 @@
 
 
 )  # set(kolourpaint_SRCS
-endif(MINGW)
+endif(CMAKE_MAJOR_VERSION MATCHES "2" AND CMAKE_MINOR_VERSION MATCHES "4" AND MINGW)
 
 set(kolourpaint_lgpl_SRCS
     ${CMAKE_CURRENT_SOURCE_DIR}/lgpl/generic/kpUrlFormatter.cpp


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