- corrected multiple model processing based on hp

- fixed cmake scripts (thanks Andrew Clarke)
- fixed streflop files to ignore softfloats if not used during build
This commit is contained in:
Mark Vejvoda
2012-03-24 18:30:49 +00:00
parent b14431385f
commit bc3cc07aba
11 changed files with 243 additions and 169 deletions

View File

@@ -165,44 +165,44 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER)
DEPENDS ${TARGET_NAME})
ENDIF()
ENDIF()
ENDIF()
# Requires an install prefix for the items below to work
IF(NOT CMAKE_INSTALL_PREFIX STREQUAL "")
# Installation of the program
INSTALL(TARGETS
${TARGET_NAME}
DESTINATION ${MEGAGLEST_BIN_INSTALL_PATH})
IF(EXISTS ${HELP2MAN})
MESSAGE(STATUS "**NOTE: Will Install manpage [${TARGET_NAME_MANPAGE}] to [${MEGAGLEST_MANPAGE_INSTALL_PATH}]")
# Installation of the program manpage file
INSTALL(FILES
"${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME_MANPAGE}"
DESTINATION ${MEGAGLEST_MANPAGE_INSTALL_PATH})
ENDIF()
# Installation of the program config and image files
INSTALL(FILES
"${PROJECT_SOURCE_DIR}/g3dviewer.ico"
DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH})
# Installation of the program desktop file
INSTALL(FILES
"${PROJECT_SOURCE_DIR}/megaglest_g3dviewer.desktop"
DESTINATION ${MEGAGLEST_DESKTOP_INSTALL_PATH})
# Installation of the program config and image files
#INSTALL(FILES
# "${PROJECT_SOURCE_DIR}/mk/linux/glest.ini"
# "${PROJECT_SOURCE_DIR}/mk/linux/glestkeys.ini"
# "${PROJECT_SOURCE_DIR}/data/glest_game/g3dviewer.ico"
# DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH})
# Installation of the program desktop icon file
#INSTALL(FILES
# "${PROJECT_SOURCE_DIR}/data/glest_game/g3dviewer.ico"
# DESTINATION ${MEGAGLEST_ICON_INSTALL_PATH})
# Requires an install prefix for the items below to work
IF(NOT CMAKE_INSTALL_PREFIX STREQUAL "")
# Installation of the program
INSTALL(TARGETS
${TARGET_NAME}
DESTINATION ${MEGAGLEST_BIN_INSTALL_PATH})
IF(EXISTS ${HELP2MAN})
MESSAGE(STATUS "**NOTE: Will Install manpage [${TARGET_NAME_MANPAGE}] to [${MEGAGLEST_MANPAGE_INSTALL_PATH}]")
# Installation of the program manpage file
INSTALL(FILES
"${EXECUTABLE_OUTPUT_PATH}/${TARGET_NAME_MANPAGE}"
DESTINATION ${MEGAGLEST_MANPAGE_INSTALL_PATH})
ENDIF()
# Installation of the program config and image files
INSTALL(FILES
"${PROJECT_SOURCE_DIR}/g3dviewer.ico"
DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH})
# Installation of the program desktop file
INSTALL(FILES
"${PROJECT_SOURCE_DIR}/megaglest_g3dviewer.desktop"
DESTINATION ${MEGAGLEST_DESKTOP_INSTALL_PATH})
# Installation of the program config and image files
#INSTALL(FILES
# "${PROJECT_SOURCE_DIR}/mk/linux/glest.ini"
# "${PROJECT_SOURCE_DIR}/mk/linux/glestkeys.ini"
# "${PROJECT_SOURCE_DIR}/data/glest_game/g3dviewer.ico"
# DESTINATION ${MEGAGLEST_DATA_INSTALL_PATH})
# Installation of the program desktop icon file
#INSTALL(FILES
# "${PROJECT_SOURCE_DIR}/data/glest_game/g3dviewer.ico"
# DESTINATION ${MEGAGLEST_ICON_INSTALL_PATH})
ENDIF()
ENDIF()