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}) QT4_ADD_RESOURCES(CompassMarks_RES_CXX ${CompassMarks_RES})
# Add here all the files which require moc compilation
# that is, all the headers with SIGNAL/SLOTS/PLUGIN_INTERFACE etc..
SET(CompassMarks_MOC_HDRS
CompassMarks.hpp)
# After this call, CompassMarks_MOC_SRCS = moc_CompassMarks.cxx
QT4_WRAP_CPP(CompassMarks_MOC_SRCS ${CompassMarks_MOC_HDRS})
SET(extLinkerOption ${QT_LIBRARIES} ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${OP ENGL_LIBRARIES} ${ICONV_LIBRARIES} ${INTL_LIBRARIES}) SET(extLinkerOption ${QT_LIBRARIES} ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${OP ENGL_LIBRARIES} ${ICONV_LIBRARIES} ${INTL_LIBRARIES})
############### For building the dynamic library ###################### ############### For building the dynamic library ######################
IF(BUILD_DYNAMIC_PLUGINS) IF(BUILD_DYNAMIC_PLUGINS)
ADD_LIBRARY(CompassMarks MODULE ${CompassMarks_SRCS} ${CompassMarks_ MOC_SRCS} ${CompassMarks_RES_CXX}) ADD_LIBRARY(CompassMarks MODULE ${CompassMarks_SRCS} ${CompassMarks_ RES_CXX})
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(CompassMarks PROPERTIES LINK_FLAGS "-u ndefined dynamic_lookup" SUFFIX ".dylib") SET_TARGET_PROPERTIES(CompassMarks PROPERTIES LINK_FLAGS "-u ndefined dynamic_lookup" SUFFIX ".dylib")
ENDIF(APPLE) ENDIF(APPLE)
IF(WIN32) IF(WIN32)
SET_TARGET_PROPERTIES(CompassMarks PROPERTIES LINK_FLAGS "-e nable-runtime-pseudo-reloc -Wl,--allow-multiple-definition" ) SET_TARGET_PROPERTIES(CompassMarks PROPERTIES LINK_FLAGS "-e nable-runtime-pseudo-reloc -Wl,--allow-multiple-definition" )
SET(StelMain stelMain) SET(StelMain stelMain)
ELSE(WIN32) ELSE(WIN32)
SET(StelMain ) SET(StelMain )
ENDIF(WIN32) ENDIF(WIN32)
TARGET_LINK_LIBRARIES(CompassMarks ${StelMain} ${extLinkerOption}) TARGET_LINK_LIBRARIES(CompassMarks ${StelMain} ${extLinkerOption})
INSTALL(TARGETS CompassMarks DESTINATION "modules/${PACKAGE}") INSTALL(TARGETS CompassMarks DESTINATION "modules/${PACKAGE}")
ENDIF() ENDIF()
############### For building the static library ###################### ############### For building the static library ######################
IF(BUILD_STATIC_PLUGINS) IF(BUILD_STATIC_PLUGINS)
ADD_LIBRARY(CompassMarks-static STATIC ${CompassMarks_SRCS} ${Compas sMarks_MOC_SRCS} ${CompassMarks_RES_CXX}) 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. # 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") SET_TARGET_PROPERTIES(CompassMarks-static PROPERTIES OUTPUT_NAME "Co mpassMarks")
TARGET_LINK_LIBRARIES(CompassMarks-static ${extLinkerOption}) TARGET_LINK_LIBRARIES(CompassMarks-static ${extLinkerOption})
SET_TARGET_PROPERTIES(CompassMarks-static PROPERTIES COMPILE_FLAGS " -DQT_STATICPLUGIN") SET_TARGET_PROPERTIES(CompassMarks-static PROPERTIES COMPILE_FLAGS " -DQT_STATICPLUGIN")
ADD_DEPENDENCIES(AllStaticPlugins CompassMarks-static) ADD_DEPENDENCIES(AllStaticPlugins CompassMarks-static)
ENDIF() ENDIF()
 End of changes. 3 change blocks. 
10 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/