Project

General

Profile

cetbuildtools.patch

Adam Lyon, 10/17/2014 12:51 AM

View differences:

Modules/BasicPlugin.cmake
68 68
  else()
69 69
    #message( STATUS "basic_plugin: PACKAGE_TOP_DIRECTORY is ${PACKAGE_TOP_DIRECTORY}")
70 70
    # base name on current subdirectory
71
    if( PACKAGE_TOP_DIRECTORY )
71
    if( PACKAGE_TOP_DIRECTORY AND (DEFINED ENV{MRB_PROJECT}) AND (NOT $ENV{MRB_PROJECT} MATCHES "gm2") )
72 72
      STRING( REGEX REPLACE "^${PACKAGE_TOP_DIRECTORY}/(.*)" "\\1" CURRENT_SUBDIR "${CMAKE_CURRENT_SOURCE_DIR}" )
73 73
    else()
74 74
      STRING( REGEX REPLACE "^${CMAKE_SOURCE_DIR}/(.*)" "\\1" CURRENT_SUBDIR "${CMAKE_CURRENT_SOURCE_DIR}" )
Modules/BuildDictionary.cmake
46 46
)
47 47

  
48 48
macro( _set_dictionary_name )
49
   if( PACKAGE_TOP_DIRECTORY )
49
   if( PACKAGE_TOP_DIRECTORY AND (DEFINED ENV{MRB_PROJECT}) AND (NOT $ENV{MRB_PROJECT} MATCHES "gm2") )
50 50
      STRING( REGEX REPLACE "^${PACKAGE_TOP_DIRECTORY}/(.*)" "\\1" CURRENT_SUBDIR "${CMAKE_CURRENT_SOURCE_DIR}" )
51 51
   else()
52 52
      STRING( REGEX REPLACE "^${CMAKE_SOURCE_DIR}/(.*)" "\\1" CURRENT_SUBDIR "${CMAKE_CURRENT_SOURCE_DIR}" )