Changeset 7429


Ignore:
Timestamp:
03/19/12 12:04:09 (2 years ago)
Author:
wjbohnh
Message:

(re-sync with common/bootstrap)

Files:
6 edited

Legend:

Unmodified
Added
Removed
  • acro-all/trunk/packages/CMakeLists.txt

    r7426 r7429  
    9595  set(Boost_USE_MULTITHREADED OFF) 
    9696  add_definitions(-DHAVE_BOOST) 
    97   if(NOT Boost_DIR) 
     97 
     98  if(Boost_DIR) 
     99    #message( "in ${CMAKE_CURRENT_BINARY_DIR} Boost_DIR already set to ${Boost_DIR}" ) 
     100    include_directories(${Boost_INCLUDE_DIR} ${Boost_INCLUDE_DIRS}) 
     101  else() 
    98102    find_package(Boost COMPONENTS signals) 
    99103    if(Boost_FOUND) 
    100       include_directories(${Boost_INCLUDE_DIRS}) 
     104      include_directories(${Boost_INCLUDE_DIR} ${Boost_INCLUDE_DIRS}) 
    101105    endif() 
    102   else() 
    103     #message( "in ${CMAKE_CURRENT_BINARY_DIR} Boost_DIR already set to ${Boost_DIR}" ) 
    104   endif() 
     106  endif(Boost_DIR) 
     107 
    105108endif(HAVE_BOOST) 
    106109 
  • acro-coliny/trunk/packages/CMakeLists.txt

    r7426 r7429  
    9595  set(Boost_USE_MULTITHREADED OFF) 
    9696  add_definitions(-DHAVE_BOOST) 
    97   if(NOT Boost_DIR) 
     97 
     98  if(Boost_DIR) 
     99    #message( "in ${CMAKE_CURRENT_BINARY_DIR} Boost_DIR already set to ${Boost_DIR}" ) 
     100    include_directories(${Boost_INCLUDE_DIR} ${Boost_INCLUDE_DIRS}) 
     101  else() 
    98102    find_package(Boost COMPONENTS signals) 
    99103    if(Boost_FOUND) 
    100       include_directories(${Boost_INCLUDE_DIRS}) 
     104      include_directories(${Boost_INCLUDE_DIR} ${Boost_INCLUDE_DIRS}) 
    101105    endif() 
    102   else() 
    103     #message( "in ${CMAKE_CURRENT_BINARY_DIR} Boost_DIR already set to ${Boost_DIR}" ) 
    104   endif() 
     106  endif(Boost_DIR) 
     107 
    105108endif(HAVE_BOOST) 
    106109 
  • acro-dakota/trunk/packages/CMakeLists.txt

    r7426 r7429  
    9595  set(Boost_USE_MULTITHREADED OFF) 
    9696  add_definitions(-DHAVE_BOOST) 
    97   if(NOT Boost_DIR) 
     97 
     98  if(Boost_DIR) 
     99    #message( "in ${CMAKE_CURRENT_BINARY_DIR} Boost_DIR already set to ${Boost_DIR}" ) 
     100    include_directories(${Boost_INCLUDE_DIR} ${Boost_INCLUDE_DIRS}) 
     101  else() 
    98102    find_package(Boost COMPONENTS signals) 
    99103    if(Boost_FOUND) 
    100       include_directories(${Boost_INCLUDE_DIRS}) 
     104      include_directories(${Boost_INCLUDE_DIR} ${Boost_INCLUDE_DIRS}) 
    101105    endif() 
    102   else() 
    103     #message( "in ${CMAKE_CURRENT_BINARY_DIR} Boost_DIR already set to ${Boost_DIR}" ) 
    104   endif() 
     106  endif(Boost_DIR) 
     107 
    105108endif(HAVE_BOOST) 
    106109 
  • acro-pebbl/trunk/packages/CMakeLists.txt

    r7426 r7429  
    9595  set(Boost_USE_MULTITHREADED OFF) 
    9696  add_definitions(-DHAVE_BOOST) 
    97   if(NOT Boost_DIR) 
     97 
     98  if(Boost_DIR) 
     99    #message( "in ${CMAKE_CURRENT_BINARY_DIR} Boost_DIR already set to ${Boost_DIR}" ) 
     100    include_directories(${Boost_INCLUDE_DIR} ${Boost_INCLUDE_DIRS}) 
     101  else() 
    98102    find_package(Boost COMPONENTS signals) 
    99103    if(Boost_FOUND) 
    100       include_directories(${Boost_INCLUDE_DIRS}) 
     104      include_directories(${Boost_INCLUDE_DIR} ${Boost_INCLUDE_DIRS}) 
    101105    endif() 
    102   else() 
    103     #message( "in ${CMAKE_CURRENT_BINARY_DIR} Boost_DIR already set to ${Boost_DIR}" ) 
    104   endif() 
     106  endif(Boost_DIR) 
     107 
    105108endif(HAVE_BOOST) 
    106109 
  • acro-pico/trunk/packages/CMakeLists.txt

    r7426 r7429  
    9595  set(Boost_USE_MULTITHREADED OFF) 
    9696  add_definitions(-DHAVE_BOOST) 
    97   if(NOT Boost_DIR) 
     97 
     98  if(Boost_DIR) 
     99    #message( "in ${CMAKE_CURRENT_BINARY_DIR} Boost_DIR already set to ${Boost_DIR}" ) 
     100    include_directories(${Boost_INCLUDE_DIR} ${Boost_INCLUDE_DIRS}) 
     101  else() 
    98102    find_package(Boost COMPONENTS signals) 
    99103    if(Boost_FOUND) 
    100       include_directories(${Boost_INCLUDE_DIRS}) 
     104      include_directories(${Boost_INCLUDE_DIR} ${Boost_INCLUDE_DIRS}) 
    101105    endif() 
    102   else() 
    103     #message( "in ${CMAKE_CURRENT_BINARY_DIR} Boost_DIR already set to ${Boost_DIR}" ) 
    104   endif() 
     106  endif(Boost_DIR) 
     107 
    105108endif(HAVE_BOOST) 
    106109 
  • acro-utilib/trunk/packages/CMakeLists.txt

    r7426 r7429  
    9595  set(Boost_USE_MULTITHREADED OFF) 
    9696  add_definitions(-DHAVE_BOOST) 
    97   if(NOT Boost_DIR) 
     97 
     98  if(Boost_DIR) 
     99    #message( "in ${CMAKE_CURRENT_BINARY_DIR} Boost_DIR already set to ${Boost_DIR}" ) 
     100    include_directories(${Boost_INCLUDE_DIR} ${Boost_INCLUDE_DIRS}) 
     101  else() 
    98102    find_package(Boost COMPONENTS signals) 
    99103    if(Boost_FOUND) 
    100       include_directories(${Boost_INCLUDE_DIRS}) 
     104      include_directories(${Boost_INCLUDE_DIR} ${Boost_INCLUDE_DIRS}) 
    101105    endif() 
    102   else() 
    103     #message( "in ${CMAKE_CURRENT_BINARY_DIR} Boost_DIR already set to ${Boost_DIR}" ) 
    104   endif() 
     106  endif(Boost_DIR) 
     107 
    105108endif(HAVE_BOOST) 
    106109 
Note: See TracChangeset for help on using the changeset viewer.