Merge from V6_main 28/02/2013

[modules/gui.git] / src / LogWindow / CMakeLists.txt

diff --git a/src/LogWindow/CMakeLists.txt b/src/LogWindow/CMakeLists.txt
index 4d0df7240d6e67bd89ce2f7928c802fb2e6dc4ad..574119a5b81f6097b6e6e94098d5e08a0481d03d 100755 (executable)
--- a/src/LogWindow/CMakeLists.txt
+++ b/src/LogWindow/CMakeLists.txt
@@ -20,7 +20,7 @@
 INCLUDE(${CMAKE_SOURCE_DIR}/adm_local/cmake_files/UseQT4EXT.cmake)
 
 INCLUDE_DIRECTORIES(
-  ${QT_INCLUDE_DIRS}
+  ${QT_INCLUDES}
   ${CMAKE_CURRENT_SOURCE_DIR}/../Qtx
   ${CMAKE_CURRENT_SOURCE_DIR}/../SUIT
 )
@@ -33,9 +33,10 @@ SET(GUITS_SOURCES
   resources/LogWindow_msg_fr.ts
 )
 
-ADD_LIBRARY(LogWindow SHARED LogWindow.cxx ${GUI_HEADERS_MOC})
-SET_TARGET_PROPERTIES(LogWindow PROPERTIES COMPILE_FLAGS "${QT_DEFINITIONS} ${PLATFORM_DEFINITIONS}")
-TARGET_LINK_LIBRARIES(LogWindow qtx suit ${QT_MT_LIBS})
+ADD_DEFINITIONS(${QT_DEFINITIONS})
+
+ADD_LIBRARY(LogWindow LogWindow.cxx ${GUI_HEADERS_MOC})
+TARGET_LINK_LIBRARIES(LogWindow qtx suit ${QT_LIBRARIES})
 INSTALL(TARGETS LogWindow DESTINATION ${GUI_salomelib_LIBS})
 
 FILE(GLOB COMMON_HEADERS_H "${CMAKE_CURRENT_SOURCE_DIR}/*.h")