CMakeLists.txt   CMakeLists.txt 
INCLUDE_DIRECTORIES(.) INCLUDE_DIRECTORIES(.)
LINK_DIRECTORIES(${BUILD_DIR}/src) LINK_DIRECTORIES(${BUILD_DIR}/src)
SET(CompassMarks_SRCS SET(CompassMarks_SRCS
CompassMarks.hpp CompassMarks.hpp
CompassMarks.cpp) CompassMarks.cpp)
SET(CompassMarks_RES ../CompassMarks.qrc) SET(CompassMarks_RES ../CompassMarks.qrc)
QT4_ADD_RESOURCES(CompassMarks_RES_CXX ${CompassMarks_RES}) QT5_ADD_RESOURCES(CompassMarks_RES_CXX ${CompassMarks_RES})
SET(extLinkerOption ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${OPENGL_LIBRARIES})
SET(extLinkerOption ${QT_LIBRARIES} ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${OP ADD_LIBRARY(CompassMarks-static STATIC ${CompassMarks_SRCS} ${CompassMarks_
ENGL_LIBRARIES} ${ICONV_LIBRARIES} ${INTL_LIBRARIES}) RES_CXX})
QT5_USE_MODULES(CompassMarks-static Core Network Widgets)
############### For building the dynamic library ###################### # The library target "CompassMarks-static" has a default OUTPUT_NAME of "Co
IF(BUILD_DYNAMIC_PLUGINS) mpassMarks-static", so change it.
ADD_LIBRARY(CompassMarks MODULE ${CompassMarks_SRCS} ${CompassMarks_ SET_TARGET_PROPERTIES(CompassMarks-static PROPERTIES OUTPUT_NAME "CompassMa
RES_CXX}) rks")
IF(APPLE) TARGET_LINK_LIBRARIES(CompassMarks-static ${extLinkerOption})
FIND_LIBRARY(OPENGL_LIBRARY OpenGL) SET_TARGET_PROPERTIES(CompassMarks-static PROPERTIES COMPILE_FLAGS "-DQT_ST
MARK_AS_ADVANCED(OPENGL_LIBRARY) ATICPLUGIN")
SET_TARGET_PROPERTIES(CompassMarks PROPERTIES LINK_FLAGS "-u ADD_DEPENDENCIES(AllStaticPlugins CompassMarks-static)
ndefined dynamic_lookup" SUFFIX ".dylib")
ENDIF(APPLE)
IF(WIN32)
SET_TARGET_PROPERTIES(CompassMarks PROPERTIES LINK_FLAGS "-
Wl,--enable-runtime-pseudo-reloc -Wl,--allow-multiple-definition" )
SET(StelMain stelMain)
ELSE(WIN32)
SET(StelMain )
ENDIF(WIN32)
TARGET_LINK_LIBRARIES(CompassMarks ${StelMain} ${extLinkerOption})
INSTALL(TARGETS CompassMarks DESTINATION "modules/${PACKAGE}")
ENDIF()
############### For building the static library ######################
IF(BUILD_STATIC_PLUGINS)
ADD_LIBRARY(CompassMarks-static STATIC ${CompassMarks_SRCS} ${Compas
sMarks_RES_CXX})
# The library target "CompassMarks-static" has a default OUTPUT_NAME
of "CompassMarks-static", so change it.
SET_TARGET_PROPERTIES(CompassMarks-static PROPERTIES OUTPUT_NAME "Co
mpassMarks")
TARGET_LINK_LIBRARIES(CompassMarks-static ${extLinkerOption})
SET_TARGET_PROPERTIES(CompassMarks-static PROPERTIES COMPILE_FLAGS "
-DQT_STATICPLUGIN")
ADD_DEPENDENCIES(AllStaticPlugins CompassMarks-static)
ENDIF()
 End of changes. 2 change blocks. 
1 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/