From 61a40ea40140b6fa71857317b66fc30073558e54 Mon Sep 17 00:00:00 2001 From: Connor Weeks Date: Sat, 30 Jul 2016 17:51:23 +0100 Subject: [PATCH] Formatting fixes for consistency --- .idea/misc.xml | 14 ++ .idea/modules.xml | 8 ++ .idea/tensorflow-cmake.iml | 13 ++ .idea/vcs.xml | 6 + .idea/workspace.xml | 261 +++++++++++++++++++++++++++++++++++++ FindEigen.cmake | 17 +-- FindProtobuf.cmake | 19 +-- FindTensorFlow.cmake | 2 +- Protobuf.cmake | 2 +- 9 files changed, 323 insertions(+), 19 deletions(-) create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/tensorflow-cmake.iml create mode 100644 .idea/vcs.xml create mode 100644 .idea/workspace.xml diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..3eb495b --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..5d7b526 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/tensorflow-cmake.iml b/.idea/tensorflow-cmake.iml new file mode 100644 index 0000000..6774f34 --- /dev/null +++ b/.idea/tensorflow-cmake.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..abed021 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,261 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + true + DEFINITION_ORDER + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1469897303697 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/FindEigen.cmake b/FindEigen.cmake index b1bb11f..b4052a7 100644 --- a/FindEigen.cmake +++ b/FindEigen.cmake @@ -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) diff --git a/FindProtobuf.cmake b/FindProtobuf.cmake index 448c7ef..1a56f28 100644 --- a/FindProtobuf.cmake +++ b/FindProtobuf.cmake @@ -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) diff --git a/FindTensorFlow.cmake b/FindTensorFlow.cmake index 377f444..4db8e81 100644 --- a/FindTensorFlow.cmake +++ b/FindTensorFlow.cmake @@ -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() diff --git a/Protobuf.cmake b/Protobuf.cmake index 79a3e64..b4d10a7 100644 --- a/Protobuf.cmake +++ b/Protobuf.cmake @@ -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}) \ No newline at end of file