CMakeLists.txt   CMakeLists.txt 
INCLUDE_DIRECTORIES(.) INCLUDE_DIRECTORIES(. gui)
LINK_DIRECTORIES(${BUILD_DIR}/src) LINK_DIRECTORIES(${BUILD_DIR}/src)
SET(AngleMeasure_SRCS SET(AngleMeasure_SRCS
AngleMeasure.hpp AngleMeasure.hpp
AngleMeasure.cpp) AngleMeasure.cpp
gui/AngleMeasureDialog.hpp
gui/AngleMeasureDialog.cpp
)
SET(AngleMeasure_UIS
gui/angleMeasureDialog.ui
)
QT5_WRAP_UI(AngleMeasure_UIS_H ${AngleMeasure_UIS})
################# compiles resources files ############ ################# compiles resources files ############
SET(AngleMeasure_RES ../AngleMeasure.qrc) SET(AngleMeasure_RES ../AngleMeasure.qrc)
QT4_ADD_RESOURCES(AngleMeasure_RES_CXX ${AngleMeasure_RES}) QT5_ADD_RESOURCES(AngleMeasure_RES_CXX ${AngleMeasure_RES})
#
SET(extLinkerOption ${QT_LIBRARIES} ${FreeType2_LIBRARIES} ${JPEG_LIBRARIES SET(extLinkerOption ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${OPENGL_LIBRARIES})
} ${PNG_LIBRARIES} ${OPENGL_LIBRARIES} ${ICONV_LIBRARIES} ${INTL_LIBRARIES}
) ADD_LIBRARY(AngleMeasure-static STATIC ${AngleMeasure_SRCS} ${AngleMeasure_
RES_CXX} ${AngleMeasure_UIS_H})
############### For building the dynamic library ###################### QT5_USE_MODULES(AngleMeasure-static Core Network Widgets)
IF(BUILD_DYNAMIC_PLUGINS) # The library target "AngleMeasure-static" has a default OUTPUT_NAME of "An
ADD_LIBRARY(AngleMeasure MODULE ${AngleMeasure_SRCS} ${AngleMeasure_ gleMeasure-static", so change it.
RES_CXX}) SET_TARGET_PROPERTIES(AngleMeasure-static PROPERTIES OUTPUT_NAME "AngleMeas
IF(APPLE) ure")
FIND_LIBRARY(OPENGL_LIBRARY OpenGL) TARGET_LINK_LIBRARIES(AngleMeasure-static ${extLinkerOption})
MARK_AS_ADVANCED(OPENGL_LIBRARY) SET_TARGET_PROPERTIES(AngleMeasure-static PROPERTIES COMPILE_FLAGS "-DQT_ST
SET_TARGET_PROPERTIES(AngleMeasure PROPERTIES LINK_FLAGS "-u ATICPLUGIN")
ndefined dynamic_lookup" SUFFIX ".dylib") ADD_DEPENDENCIES(AllStaticPlugins AngleMeasure-static)
ENDIF(APPLE)
IF(WIN32)
SET_TARGET_PROPERTIES(AngleMeasure PROPERTIES LINK_FLAGS "-
Wl,--enable-runtime-pseudo-reloc -Wl,--allow-multiple-definition" )
SET(StelMain stelMain)
ELSE(WIN32)
SET(StelMain )
ENDIF(WIN32)
TARGET_LINK_LIBRARIES(AngleMeasure ${StelMain} ${extLinkerOption})
INSTALL(TARGETS AngleMeasure DESTINATION "modules/${PACKAGE}")
ENDIF()
############### For building the static library ######################
IF(BUILD_STATIC_PLUGINS)
ADD_LIBRARY(AngleMeasure-static STATIC ${AngleMeasure_SRCS} ${AngleM
easure_RES_CXX})
# The library target "AngleMeasure-static" has a default OUTPUT_NAME
of "AngleMeasure-static", so change it.
SET_TARGET_PROPERTIES(AngleMeasure-static PROPERTIES OUTPUT_NAME "An
gleMeasure")
TARGET_LINK_LIBRARIES(AngleMeasure-static ${extLinkerOption})
SET_TARGET_PROPERTIES(AngleMeasure-static PROPERTIES COMPILE_FLAGS "
-DQT_STATICPLUGIN")
ADD_DEPENDENCIES(AllStaticPlugins AngleMeasure-static)
ENDIF()
 End of changes. 3 change blocks. 
2 lines changed or deleted 11 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/