Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5667 for code/branches


Ignore:
Timestamp:
Aug 22, 2009, 10:51:21 PM (15 years ago)
Author:
rgrieder
Message:
  • New option for developers: Define ORXONOX_DEV as environment variable and the install command will make a copyable installation to ${CMAKE_BINARY_DIR}/install.
  • Removed reoccurring "Using package for library…" message (displayed only once now)
  • Using CMAKE_DEPENDENT_OPTION for the PCH_ENABLE_${target} options
Location:
code/branches/resource2/cmake
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • code/branches/resource2/cmake/InstallConfig.cmake

    r5664 r5667  
    2424 #
    2525
     26IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) # Variable provided by CMake
     27  IF("$ENV{ORXONOX_DEV}" OR TARDIS)
     28    SET(_install_prefix_changed 1)
     29    SET(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/install CACHE PATH
     30        "Install path prefix, prepended onto install directories." FORCE)
     31  ENDIF()
     32ENDIF()
     33
    2634SET(_info_text "Puts all installed files in subfolders of the install prefix path. That root folder can then be moved, copied and renamed as you wish. The executable will not write to folders like ~/.orxonox or \"Applictation Data\"")
    27 IF(UNIX)
     35IF(UNIX AND NOT _install_prefix_changed)
    2836  OPTION(INSTALL_COPYABLE "${_info_text}" FALSE)
    2937ELSE()
  • code/branches/resource2/cmake/PackageConfig.cmake

    r5641 r5667  
    5151ENDIF()
    5252
    53 MESSAGE(STATUS "Using library package for the dependencies.")
     53IF(NOT _INTERNAL_PACKAGE_MESSAGE)
     54  MESSAGE(STATUS "Using library package for the dependencies.")
     55  SET(_INTERNAL_PACKAGE_MESSAGE 1 CACHE INTERNAL "Do not edit!" FORCE)
     56ENDIF()
    5457
    5558# Include paths and other special treatments
  • code/branches/resource2/cmake/TargetUtilities.cmake

    r5641 r5667  
    5252 #
    5353
     54INCLUDE(CMakeDependentOption)
    5455INCLUDE(CapitaliseName)
    5556INCLUDE(GenerateToluaBindings)
     
    112113
    113114  # First part (pre target) of precompiled header files
    114   IF(PCH_COMPILER_SUPPORT AND PCH_ENABLE AND _arg_PCH_FILE)
     115  IF(PCH_COMPILER_SUPPORT AND _arg_PCH_FILE)
    115116    # Provide convenient option to control PCH
    116117    STRING(TOUPPER "${_target_name}" _target_name_upper)
     
    120121      SET(PCH_DEFAULT TRUE)
    121122    ENDIF()
    122     OPTION(PCH_ENABLE_${_target_name_upper} "Enable using precompiled header files for library ${_target_name}." ${PCH_DEFAULT})
     123    CMAKE_DEPENDENT_OPTION(PCH_ENABLE_${_target_name_upper}
     124      "Enable using precompiled header files for library ${_target_name}." ${PCH_DEFAULT} PCH_ENABLE OFF)
    123125
    124126    IF(PCH_ENABLE_${_target_name_upper})
Note: See TracChangeset for help on using the changeset viewer.