Skip to content

Commit

Permalink
Formatting fixes for consistency
Browse files Browse the repository at this point in the history
  • Loading branch information
cjweeks committed Jul 30, 2016
1 parent 15d036d commit 61a40ea
Show file tree
Hide file tree
Showing 9 changed files with 323 additions and 19 deletions.
14 changes: 14 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/tensorflow-cmake.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

261 changes: 261 additions & 0 deletions .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 9 additions & 8 deletions FindEigen.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,22 @@ include(Eigen_VERSION)
unset(EIGEN_FOUND)

find_path(Eigen_INCLUDE_DIR
NAMES
${Eigen_DIR}
${Eigen_DIR}/unsupported
${Eigen_DIR}/Eigen
HINTS
${Eigen_INSTALL_DIR}/include/eigen)
NAMES
${Eigen_DIR}
${Eigen_DIR}/unsupported
${Eigen_DIR}/Eigen
HINTS
${Eigen_INSTALL_DIR}/include/eigen)

# set Eigen_FOUND
find_package_handle_standard_args(Eigen DEFAULT_MSG Eigen_INCLUDE_DIR)

# set external variables for usage in CMakeLists.txt
if (EIGEN_FOUND)
set(Eigen_INCLUDE_DIRS ${Eigen_INCLUDE_DIR} ${Eigen_INCLUDE_DIR}/${Eigen_DIR})
if(EIGEN_FOUND)
set(Eigen_INCLUDE_DIRS ${Eigen_INCLUDE_DIR} ${Eigen_INCLUDE_DIR}/${Eigen_DIR})
endif()



# hide locals from GUI
mark_as_advanced(Eigen_INCLUDE_DIR)
19 changes: 10 additions & 9 deletions FindProtobuf.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,24 @@ include(Protobuf_VERSION)
unset(PROTOBUF_FOUND)

find_path(Protobuf_INCLUDE_DIR
NAMES
protobuf
HINTS
${Protobuf_INSTALL_DIR}/include/google)
NAMES
protobuf
HINTS
${Protobuf_INSTALL_DIR}/include/google)

find_library(Protobuf_LIBRARY NAMES protobuf
HINTS
${Protobuf_INSTALL_DIR}/lib)
HINTS
${Protobuf_INSTALL_DIR}/lib)
# set Protobuf_FOUND
find_package_handle_standard_args(Protobuf DEFAULT_MSG Protobuf_INCLUDE_DIR Protobuf_LIBRARY)

# set external variables for usage in CMakeLists.txt
if (PROTOBUF_FOUND)
set(Protobuf_LIBRARIES ${Protobuf_LIBRARY})
set(Protobuf_INCLUDE_DIRS ${Protobuf_INCLUDE_DIR})
if(PROTOBUF_FOUND)
set(Protobuf_LIBRARIES ${Protobuf_LIBRARY})
set(Protobuf_INCLUDE_DIRS ${Protobuf_INCLUDE_DIR})
endif()



# hide locals from GUI
mark_as_advanced(Protobuf_INCLUDE_DIR)
2 changes: 1 addition & 1 deletion FindTensorFlow.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ find_library(TensorFlow_LIBRARY NAMES tensorflow_all
find_package_handle_standard_args(TensorFlow DEFAULT_MSG TensorFlow_INCLUDE_DIR TensorFlow_LIBRARY)

# set external variables for usage in CMakeLists.txt
if (TENSORFLOW_FOUND)
if(TENSORFLOW_FOUND)
set(TensorFlow_LIBRARIES ${TensorFlow_LIBRARY})
set(TensorFlow_INCLUDE_DIRS ${TensorFlow_INCLUDE_DIR})
endif()
Expand Down
2 changes: 1 addition & 1 deletion Protobuf.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ ExternalProject_Add(Protobuf
#TEST_COMMAND cd ${Protobuf_DOWNLOAD_DIR} && make check
INSTALL_COMMAND make install)

include_directories(${Protobuf_INCLUDE_DIRS})
include_directories(${Protobuf_INCLUDE_DIRS})

0 comments on commit 61a40ea

Please sign in to comment.