CMakeLists.txt   CMakeLists.txt 
skipping to change at line 24 skipping to change at line 24
gui/TimeZoneConfigurationWindow.cpp gui/TimeZoneConfigurationWindow.cpp
gui/DefineTimeZoneWindow.hpp gui/DefineTimeZoneWindow.hpp
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}) QT5_WRAP_UI(TimeZoneConfiguration_UIS_H ${TimeZoneConfiguration_UIS})
SET(extLinkerOption ${QT_LIBRARIES} ${OPENGL_LIBRARIES} ${ICONV_LIBRARIES} ${INTL_LIBRARIES}) SET(extLinkerOption ${OPENGL_LIBRARIES})
#Dynamic library ADD_LIBRARY(TimeZoneConfiguration-static STATIC ${TimeZoneConfiguration_SRC
IF(BUILD_DYNAMIC_PLUGINS) S} ${TimeZoneConfiguration_RES_CXX} ${TimeZoneConfiguration_UIS_H})
ADD_LIBRARY(TimeZoneConfiguration MODULE ${TimeZoneConfiguration_SRCS} ${T QT5_USE_MODULES(TimeZoneConfiguration-static Core Declarative Network)
imeZoneConfiguration_RES_CXX} ${TimeZoneConfiguration_UIS_H}) SET_TARGET_PROPERTIES(TimeZoneConfiguration-static PROPERTIES OUTPUT_NAME "
TimeZoneConfiguration")
IF(APPLE) TARGET_LINK_LIBRARIES(TimeZoneConfiguration-static ${extLinkerOption})
FIND_LIBRARY(OPENGL_LIBRARY OpenGL) SET_TARGET_PROPERTIES(TimeZoneConfiguration-static PROPERTIES COMPILE_FLAGS
MARK_AS_ADVANCED(OPENGL_LIBRARY) "-DQT_STATICPLUGIN")
SET_TARGET_PROPERTIES(TimeZoneConfiguration PROPERTIES LINK_FLAGS "-undef ADD_DEPENDENCIES(AllStaticPlugins TimeZoneConfiguration-static)
ined dynamic_lookup" SUFFIX ".dylib")
ENDIF(APPLE)
IF(WIN32)
SET_TARGET_PROPERTIES(TimeZoneConfiguration PROPERTIES LINK_FLAGS "-Wl,--
enable-runtime-pseudo-reloc -Wl,--allow-multiple-definition" )
SET(StelMain stelMain)
ELSE(WIN32)
SET(StelMain )
ENDIF(WIN32)
TARGET_LINK_LIBRARIES(TimeZoneConfiguration ${StelMain} ${extLinkerOption}
)
INSTALL(TARGETS TimeZoneConfiguration DESTINATION "modules/TimeZoneConfigu
ration")
ENDIF()
#Static library
IF(BUILD_STATIC_PLUGINS)
ADD_LIBRARY(TimeZoneConfiguration-static STATIC ${TimeZoneConfiguration_SR
CS} ${TimeZoneConfiguration_RES_CXX} ${TimeZoneConfiguration_UIS_H})
SET_TARGET_PROPERTIES(TimeZoneConfiguration-static PROPERTIES OUTPUT_NAME
"TimeZoneConfiguration")
TARGET_LINK_LIBRARIES(TimeZoneConfiguration-static ${extLinkerOption})
SET_TARGET_PROPERTIES(TimeZoneConfiguration-static PROPERTIES COMPILE_FLAG
S "-DQT_STATICPLUGIN")
ADD_DEPENDENCIES(AllStaticPlugins TimeZoneConfiguration-static)
ENDIF()
 End of changes. 3 change blocks. 
2 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/