CMakeLists.txt   CMakeLists.txt 
skipping to change at line 26 skipping to change at line 26
gui/DefineTimeZoneWindow.cpp gui/DefineTimeZoneWindow.cpp
) )
SET(TimeZoneConfiguration_UIS SET(TimeZoneConfiguration_UIS
gui/timeZoneConfigurationWindow.ui gui/timeZoneConfigurationWindow.ui
gui/defineTimeZone.ui gui/defineTimeZone.ui
) )
QT4_WRAP_UI(TimeZoneConfiguration_UIS_H ${TimeZoneConfiguration_UIS}) QT4_WRAP_UI(TimeZoneConfiguration_UIS_H ${TimeZoneConfiguration_UIS})
#SET(TimeZoneConfiguration_RES ../resources/resources.qrc)
#QT4_ADD_RESOURCES(TimeZoneConfiguration_RES_CXX ${TimeZoneConfiguration_RE
S})
SET(TimeZoneConfiguration_MOC_HDRS
gui/TimeZoneConfigurationWindow.hpp
gui/DefineTimeZoneWindow.hpp
TimeZoneConfiguration.hpp
)
QT4_WRAP_CPP(TimeZoneConfiguration_MOC_SRCS ${TimeZoneConfiguration_MOC_HDR
S})
SET(extLinkerOption ${QT_LIBRARIES} ${OPENGL_LIBRARIES} ${ICONV_LIBRARIES} ${INTL_LIBRARIES}) SET(extLinkerOption ${QT_LIBRARIES} ${OPENGL_LIBRARIES} ${ICONV_LIBRARIES} ${INTL_LIBRARIES})
#Dynamic library #Dynamic library
IF(BUILD_DYNAMIC_PLUGINS) IF(BUILD_DYNAMIC_PLUGINS)
ADD_LIBRARY(TimeZoneConfiguration MODULE ${TimeZoneConfiguration_SRCS} ${T imeZoneConfiguration_MOC_SRCS} ${TimeZoneConfiguration_RES_CXX} ${TimeZoneC onfiguration_UIS_H}) ADD_LIBRARY(TimeZoneConfiguration MODULE ${TimeZoneConfiguration_SRCS} ${T imeZoneConfiguration_RES_CXX} ${TimeZoneConfiguration_UIS_H})
IF(APPLE) IF(APPLE)
FIND_LIBRARY(OPENGL_LIBRARY OpenGL) FIND_LIBRARY(OPENGL_LIBRARY OpenGL)
MARK_AS_ADVANCED(OPENGL_LIBRARY) MARK_AS_ADVANCED(OPENGL_LIBRARY)
SET_TARGET_PROPERTIES(TimeZoneConfiguration PROPERTIES LINK_FLAGS "-undef ined dynamic_lookup" SUFFIX ".dylib") SET_TARGET_PROPERTIES(TimeZoneConfiguration PROPERTIES LINK_FLAGS "-undef ined dynamic_lookup" SUFFIX ".dylib")
ENDIF(APPLE) ENDIF(APPLE)
IF(WIN32) IF(WIN32)
SET_TARGET_PROPERTIES(TimeZoneConfiguration PROPERTIES LINK_FLAGS "-enabl e-runtime-pseudo-reloc -Wl,--allow-multiple-definition" ) SET_TARGET_PROPERTIES(TimeZoneConfiguration PROPERTIES LINK_FLAGS "-enabl e-runtime-pseudo-reloc -Wl,--allow-multiple-definition" )
SET(StelMain stelMain) SET(StelMain stelMain)
skipping to change at line 63 skipping to change at line 52
SET(StelMain ) SET(StelMain )
ENDIF(WIN32) ENDIF(WIN32)
TARGET_LINK_LIBRARIES(TimeZoneConfiguration ${StelMain} ${extLinkerOption} ) TARGET_LINK_LIBRARIES(TimeZoneConfiguration ${StelMain} ${extLinkerOption} )
INSTALL(TARGETS TimeZoneConfiguration DESTINATION "modules/TimeZoneConfigu ration") INSTALL(TARGETS TimeZoneConfiguration DESTINATION "modules/TimeZoneConfigu ration")
ENDIF() ENDIF()
#Static library #Static library
IF(BUILD_STATIC_PLUGINS) IF(BUILD_STATIC_PLUGINS)
ADD_LIBRARY(TimeZoneConfiguration-static STATIC ${TimeZoneConfiguration_SR CS} ${TimeZoneConfiguration_MOC_SRCS} ${TimeZoneConfiguration_RES_CXX} ${Ti meZoneConfiguration_UIS_H}) ADD_LIBRARY(TimeZoneConfiguration-static STATIC ${TimeZoneConfiguration_SR CS} ${TimeZoneConfiguration_RES_CXX} ${TimeZoneConfiguration_UIS_H})
SET_TARGET_PROPERTIES(TimeZoneConfiguration-static PROPERTIES OUTPUT_NAME "TimeZoneConfiguration") SET_TARGET_PROPERTIES(TimeZoneConfiguration-static PROPERTIES OUTPUT_NAME "TimeZoneConfiguration")
TARGET_LINK_LIBRARIES(TimeZoneConfiguration-static ${extLinkerOption}) TARGET_LINK_LIBRARIES(TimeZoneConfiguration-static ${extLinkerOption})
SET_TARGET_PROPERTIES(TimeZoneConfiguration-static PROPERTIES COMPILE_FLAG S "-DQT_STATICPLUGIN") SET_TARGET_PROPERTIES(TimeZoneConfiguration-static PROPERTIES COMPILE_FLAG S "-DQT_STATICPLUGIN")
ADD_DEPENDENCIES(AllStaticPlugins TimeZoneConfiguration-static) ADD_DEPENDENCIES(AllStaticPlugins TimeZoneConfiguration-static)
ENDIF() ENDIF()
 End of changes. 3 change blocks. 
15 lines changed or deleted 2 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/