CMakeLists.txt   CMakeLists.txt 
INCLUDE_DIRECTORIES(.) INCLUDE_DIRECTORIES(.)
LINK_DIRECTORIES(${BUILD_DIR}/src) LINK_DIRECTORIES(${BUILD_DIR}/src)
SET(Supernovas_SRCS SET(Supernovae_SRCS
Supernovas.hpp Supernovae.hpp
Supernovas.cpp Supernovae.cpp
Supernova.hpp Supernova.hpp
Supernova.cpp) Supernova.cpp)
SET(Supernovas_RES ../resources/Supernovas.qrc) SET(Supernovae_RES ../resources/Supernovae.qrc)
QT4_ADD_RESOURCES(Supernovas_RES_CXX ${Supernovas_RES}) QT4_ADD_RESOURCES(Supernovae_RES_CXX ${Supernovae_RES})
SET(Supernovas_MOC_HDRS SET(Supernovae_MOC_HDRS
Supernovas.hpp) Supernovae.hpp)
QT4_WRAP_CPP(Supernovas_MOC_SRCS ${Supernovas_MOC_HDRS}) QT4_WRAP_CPP(Supernovae_MOC_SRCS ${Supernovae_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(Supernovas MODULE ${Supernovas_SRCS} ${Supernovas_MOC_SR CS} ${Supernovas_RES_CXX}) ADD_LIBRARY(Supernovae MODULE ${Supernovae_SRCS} ${Supernovae_MOC_SR CS} ${Supernovae_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(Supernovas PROPERTIES LINK_FLAGS "-und efined dynamic_lookup" SUFFIX ".dylib") SET_TARGET_PROPERTIES(Supernovae PROPERTIES LINK_FLAGS "-und efined dynamic_lookup" SUFFIX ".dylib")
ENDIF() ENDIF()
IF(WIN32) IF(WIN32)
SET_TARGET_PROPERTIES(Supernovas PROPERTIES LINK_FLAGS "-ena ble-runtime-pseudo-reloc -Wl,--allow-multiple-definition" ) SET_TARGET_PROPERTIES(Supernovae PROPERTIES LINK_FLAGS "-ena ble-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(Supernovas ${StelMain} ${extLinkerOption}) TARGET_LINK_LIBRARIES(Supernovae ${StelMain} ${extLinkerOption})
INSTALL(TARGETS Supernovas DESTINATION "modules/Supernovas") INSTALL(TARGETS Supernovae DESTINATION "modules/Supernovae")
ENDIF() ENDIF()
############### For building the static library ###################### ############### For building the static library ######################
IF(BUILD_STATIC_PLUGINS) IF(BUILD_STATIC_PLUGINS)
ADD_LIBRARY(Supernovas-static STATIC ${Supernovas_SRCS} ${Supernovas ADD_LIBRARY(Supernovae-static STATIC ${Supernovae_SRCS} ${Supernovae
_MOC_SRCS} ${Supernovas_RES_CXX}) _MOC_SRCS} ${Supernovae_RES_CXX})
SET_TARGET_PROPERTIES(Supernovas-static PROPERTIES OUTPUT_NAME "Supe SET_TARGET_PROPERTIES(Supernovae-static PROPERTIES OUTPUT_NAME "Supe
rnovas") rnovae")
TARGET_LINK_LIBRARIES(Supernovas-static ${extLinkerOption}) TARGET_LINK_LIBRARIES(Supernovae-static ${extLinkerOption})
SET_TARGET_PROPERTIES(Supernovas-static PROPERTIES COMPILE_FLAGS "-D SET_TARGET_PROPERTIES(Supernovae-static PROPERTIES COMPILE_FLAGS "-D
QT_STATICPLUGIN") QT_STATICPLUGIN")
ADD_DEPENDENCIES(AllStaticPlugins Supernovas-static) ADD_DEPENDENCIES(AllStaticPlugins Supernovae-static)
ENDIF() ENDIF()
 End of changes. 9 change blocks. 
21 lines changed or deleted 21 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/