diff options
| author | Michael L Dickens <mlk@alum.mit.edu> | 2013-01-04 21:32:13 -0500 |
|---|---|---|
| committer | Michael L Dickens <mlk@alum.mit.edu> | 2013-01-04 21:32:13 -0500 |
| commit | c03114f9861920b246c36bb7e6b2098dadacd60e (patch) | |
| tree | 3e15aff8e513d7b745f971fd5de0023d6135d83c /gruel | |
| parent | 68e99469dddd3b0347f59d0e3f50c60379390351 (diff) | |
| parent | baaf2b6cf06f464a710c3f36db4c9275dd915d92 (diff) | |
Merge master/fix_build_dir_order into next, then fix conflicts and redo come of the INCLUDE_DIRS order
Diffstat (limited to 'gruel')
| -rw-r--r-- | gruel/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | gruel/src/lib/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | gruel/src/swig/CMakeLists.txt | 6 |
3 files changed, 10 insertions, 6 deletions
diff --git a/gruel/CMakeLists.txt b/gruel/CMakeLists.txt index 3e8c5166e5..627135abe9 100644 --- a/gruel/CMakeLists.txt +++ b/gruel/CMakeLists.txt @@ -37,7 +37,6 @@ include(GrMiscUtils) GR_SET_GLOBAL(GRUEL_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/src/include ${CMAKE_CURRENT_BINARY_DIR}/src/include - ${Boost_INCLUDE_DIRS} ) ######################################################################## diff --git a/gruel/src/lib/CMakeLists.txt b/gruel/src/lib/CMakeLists.txt index e7713536ce..5d7980dd57 100644 --- a/gruel/src/lib/CMakeLists.txt +++ b/gruel/src/lib/CMakeLists.txt @@ -64,10 +64,11 @@ GR_INCLUDE_SUBDIRECTORY(pmt) ######################################################################## # Setup the include and linker paths ######################################################################## -include_directories(${GRUEL_INCLUDE_DIRS}) -include_directories(${CMAKE_CURRENT_SOURCE_DIR}) - -include_directories(${Boost_INCLUDE_DIRS}) +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} + ${GRUEL_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} +) link_directories(${Boost_LIBRARY_DIRS}) ######################################################################## diff --git a/gruel/src/swig/CMakeLists.txt b/gruel/src/swig/CMakeLists.txt index b1d4090af0..ad0139b538 100644 --- a/gruel/src/swig/CMakeLists.txt +++ b/gruel/src/swig/CMakeLists.txt @@ -24,7 +24,11 @@ include(GrPython) include(GrSwig) set(GR_SWIG_TARGET_DEPS pmt_generated) -set(GR_SWIG_INCLUDE_DIRS ${GRUEL_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR} ${Boost_INCLUDE_DIRS}) +set(GR_SWIG_INCLUDE_DIRS + ${CMAKE_CURRENT_BINARY_DIR} + ${GRUEL_INCLUDE_DIRS} + ${Boost_INCLUDE_DIRS} +) set(GR_SWIG_LIBRARIES gruel) set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/pmt_swig_doc.i) |