Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Oct 4, 2015, 9:12:21 PM (8 years ago)
Author:
landauf
Message:

merged branch core7 back to trunk

Location:
code/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • code/trunk

  • code/trunk/CMakeLists.txt

    r9550 r10624  
    6565SET(DEFAULT_ARCHIVE_PATH lib/static)
    6666SET(DEFAULT_MODULE_PATH  lib/modules)
     67SET(DEFAULT_PLUGIN_PATH  lib/plugins)
    6768SET(DEFAULT_DOC_PATH     doc)
    6869SET(DEFAULT_DATA_PATH    data)
     
    7677SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${DEFAULT_ARCHIVE_PATH})
    7778SET(CMAKE_MODULE_OUTPUT_DIRECTORY  ${CMAKE_BINARY_DIR}/${DEFAULT_MODULE_PATH})
     79SET(CMAKE_PLUGIN_OUTPUT_DIRECTORY  ${CMAKE_BINARY_DIR}/${DEFAULT_PLUGIN_PATH})
    7880SET(CMAKE_DOC_OUTPUT_DIRECTORY     ${CMAKE_BINARY_DIR}/${DEFAULT_DOC_PATH})
    7981# Data directories are only inputs, no delclaration here
     
    8183SET(CMAKE_LOG_OUTPUT_DIRECTORY     ${CMAKE_BINARY_DIR}/${DEFAULT_LOG_PATH})
    8284
    83 # Set the extension of the dynamic modules
     85# Set the extension of the helper-files for dynamic modules
    8486SET(ORXONOX_MODULE_EXTENSION ".module")
     87SET(ORXONOX_PLUGIN_EXTENSION ".plugin")
     88
     89# Delete all existing helper-files for dynamic modules
     90# modules:
     91FILE(GLOB_RECURSE _helper_files ${CMAKE_MODULE_OUTPUT_DIRECTORY}/*${ORXONOX_MODULE_EXTENSION})
     92IF(_helper_files)
     93  FILE(REMOVE ${_helper_files})
     94ENDIF()
     95# plugins:
     96FILE(GLOB_RECURSE _helper_files ${CMAKE_PLUGIN_OUTPUT_DIRECTORY}/*${ORXONOX_PLUGIN_EXTENSION})
     97IF(_helper_files)
     98  FILE(REMOVE ${_helper_files})
     99ENDIF()
    85100
    86101# Sets where to find the external libraries like OgreMain.dll at runtime
Note: See TracChangeset for help on using the changeset viewer.