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

List:       kde-commits
Subject:    extragear/graphics/digikam
From:       Patrick Spendrin <ps_ml () gmx ! de>
Date:       2008-10-26 3:06:03
Message-ID: 1224990363.974996.12411.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 875950 by sengels:

restrict KDE4_ENABLE_EXCEPTIONS to where it is needed with msvc
This means digikam builds now both under mingw and msvc

 M  +5 -1      CMakeLists.txt  
 M  +1 -0      digikam/CMakeLists.txt  
 M  +3 -1      showfoto/CMakeLists.txt  


--- trunk/extragear/graphics/digikam/CMakeLists.txt #875949:875950
@@ -321,7 +321,9 @@
                    )
 
     # Enable C++ Exceptions support, require by Greycstoration algorithm (CImg.h)
-    ADD_DEFINITIONS(${KDE4_ENABLE_EXCEPTIONS})
+    IF(NOT MSVC)
+        ADD_DEFINITIONS(${KDE4_ENABLE_EXCEPTIONS})
+    ENDIF(NOT MSVC)
 
     INCLUDE_DIRECTORIES(${KIPI_INCLUDE_DIR}
                         ${KEXIV2_INCLUDE_DIR}
@@ -391,6 +393,8 @@
         ${CMAKE_CURRENT_SOURCE_DIR}/libs/greycstoration/greycstorationwidget.cpp
        )
 
+    SET_SOURCE_FILES_PROPERTIES(${libgreycstoration_SRCS} PROPERTIES COMPILE_FLAGS \
${KDE4_ENABLE_EXCEPTIONS}) +
     SET(libhistogram_SRCS
         ${CMAKE_CURRENT_SOURCE_DIR}/libs/histogram/imagehistogram.cpp
        )
--- trunk/extragear/graphics/digikam/digikam/CMakeLists.txt #875949:875950
@@ -127,6 +127,7 @@
 SET_TARGET_PROPERTIES(digikam PROPERTIES VERSION 1.0.0 SOVERSION 1)
 IF(WIN32)
     SET_TARGET_PROPERTIES(digikam PROPERTIES COMPILE_FLAGS -DJPEG_STATIC)
+    SET_TARGET_PROPERTIES(digikam PROPERTIES OUTPUT_NAME digikamlib)
 ENDIF(WIN32)
 INSTALL(TARGETS digikam ${INSTALL_TARGETS_DEFAULT_ARGS})
 
--- trunk/extragear/graphics/digikam/showfoto/CMakeLists.txt #875949:875950
@@ -1,5 +1,7 @@
 #Require by Greycstoration algorithm (CImg.h)
-ADD_DEFINITIONS(${KDE4_ENABLE_EXCEPTIONS})
+IF(NOT MSVC)
+    ADD_DEFINITIONS(${KDE4_ENABLE_EXCEPTIONS})
+ENDIF(NOT MSVC)
 
 ADD_SUBDIRECTORY(setup)
 


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