- Timestamp:
- Feb 12, 2009, 9:41:17 AM (16 years ago)
- Location:
- code/branches/buildsystem2
- Files:
-
- 2 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/buildsystem2/CMakeLists.txt
r2640 r2644 42 42 INCLUDE(BuildConfig) 43 43 44 # Configure media directory location and installation 45 ADD_SUBDIRECTORY(media) 46 44 47 # Creates the actual project 45 48 ADD_SUBDIRECTORY(src) 46 49 47 50 # Configure the binary output directory 48 ADD_SUBDIRECTORY(bin -config)51 ADD_SUBDIRECTORY(bin) 49 52 50 53 # Last but not least: Try to make doxygen target -
code/branches/buildsystem2/bin/CMakeLists.txt
r2628 r2644 36 36 37 37 SET(WRITABLE_CONFIG_FILES 38 orxonox.ini39 38 ) 39 40 # Not getting installed 41 SET(ORXONOX_INI orxonox.ini) 40 42 41 43 IF(TARDIS) … … 86 88 CONFIGURE_FILES("${_file_name}" "${BUILD_CONFIGS}" TRUE) 87 89 ENDFOREACH(_file_name) 88 FOREACH(_file_name ${WRITABLE_CONFIG_FILES} )90 FOREACH(_file_name ${WRITABLE_CONFIG_FILES} ${ORXONOX_INI}) 89 91 CONFIGURE_FILES("${_file_name}" "${BUILD_CONFIGS}" FALSE) 90 92 ENDFOREACH(_file_name) 93 94 95 ################ Installation ################# 96 97 # Not using collective call to allow configuration with CMake. 98 FOREACH(_file ${READ_ONLY_CONFIG_FILES} ${WRITABLE_CONFIG_FILES}) 99 IF(CMAKE_CONFIGURATION_TYPES) 100 FOREACH(_configuration ${CMAKE_CONFIGURATION_TYPES}) 101 INSTALL(FILES ${CMAKE_BINARY_DIR}/bin/${_configuration}/${_file} 102 DESTINATION bin CONFIGURATIONS ${_configuration}) 103 ENDFOREACH(_configuration) 104 ELSE() 105 INSTALL(FILES ${CMAKE_BINARY_DIR}/bin/${_file} DESTINATION bin) 106 ENDIF() 107 ENDFOREACH(_file) 108 91 109 92 110 ################ Run Scripts ################## -
code/branches/buildsystem2/cmake/BuildConfig.cmake
r2636 r2644 55 55 56 56 OPTION(EXTRA_WARNINGS "Enable some extra warnings (heavily pollutes the output)") 57 58 # Specify media directory59 GET_FILENAME_COMPONENT(_media_path "${CMAKE_SOURCE_DIR}/../media" ABSOLUTE)60 SET(ORXONOX_MEDIA_DIRECTORY ${_media_path} CACHE PATH61 "Location of the media directory.")62 IF(NOT EXISTS ${ORXONOX_MEDIA_DIRECTORY})63 MESSAGE(STATUS "Warning: The media directory does not exist ${ORXONOX_MEDIA_DIRECTORY}")64 ENDIF()65 57 66 58 # More plugins: Plugin_BSPSceneManager, Plugin_OctreeSceneManager -
code/branches/buildsystem2/cmake/LibraryConfig.cmake
r2641 r2644 60 60 ENDFOREACH(_file) 61 61 ENDIF() 62 63 # On Windows, DLLs have to be in the executable folder 64 IF(WIN32) 65 # When installing a debug version, we really can't know which libraries 66 # are used in released mode because there might be deps of deps. 67 INSTALL(DIRECTORY ${DEP_BINARY_DIR}/ DESTINATION bin CONFIGURATIONS Debug) 68 69 # Try to filter out all the debug libraries. If the regex doesn't do the 70 # job anymore, simply adjust it. 71 FILE(GLOB _dependencies_all "${DEP_BINARY_DIR}/*") 72 FOREACH(_dep ${_dependencies_all}) 73 IF(NOT _dep MATCHES "_[Dd]\\.[a-zA-Z0-9+-]+$|-mt-gd-|^.*\\.pdb$") 74 LIST(APPEND _dependencies_release "${_dep}") 75 ENDIF() 76 ENDFOREACH(_dep) 77 INSTALL(FILES ${_dependencies_release} DESTINATION bin 78 CONFIGURATIONS Release RelWithDebInfo MinSizeRel) 79 ENDIF(WIN32) 62 80 ENDIF(USE_DEPENDENCY_PACKAGE) 63 81
Note: See TracChangeset
for help on using the changeset viewer.