[Uml-devel] KDE/kdesdk/umbrello/umbrello

[Christian Ehrlicher]

SVN commit 791512 by chehrlic:

you want use boost - then search for it... fix win32 compilation

 M  +13 -4     CMakeLists.txt  


--- trunk/KDE/kdesdk/umbrello/umbrello/CMakeLists.txt #791511:791512
@@ -14,8 +14,20 @@
 
 add_definitions (-DQT3_SUPPORT_WARNINGS)
 
-include_directories (${LIBXML2_INCLUDE_DIR} ${LIBXSLT_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/)
+#boost is a hard dependency
+find_package(Boost)
+macro_log_feature(Boost_FOUND "boost" "Boost C++ Libraries" "http://www.boost.org" TRUE "1_33_0" "Needed by several critical PIM libraries.")
 
+# Some Boost require exceptions
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}  ${KDE4_ENABLE_EXCEPTIONS}")
+
+include_directories (
+  ${LIBXML2_INCLUDE_DIR}
+  ${LIBXSLT_INCLUDE_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}/dialogs/
+  ${Boost_INCLUDE_DIR}
+)
+
 set(libcodegenerator_SRCS
 	codegenerators/codegenfactory.cpp 
 	codegenerators/codegenpolicyext.cpp 
@@ -409,9 +421,6 @@
 	${libumbrello_SRCS}
 )
 
-# Some Boost require exceptions
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}  ${KDE4_ENABLE_EXCEPTIONS}")
-
 kde4_add_app_icon(umbrello_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/hi*-app-umbrello.png")
 kde4_add_executable(umbrello ${umbrello_SRCS})
 target_link_libraries(umbrello  ${LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES} ${LIBUUID} )