Merge remote-tracking branch 'refs/remotes/origin/calib_cmake'

arpg · Jun 21, 2014 · 2b5ae8e · 2b5ae8e
2 parents a4b3f7b + 7601b6b
commit 2b5ae8e
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 30 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -42,7 +42,7 @@ export_package(Calibu
   )
 
 if( BUILD_APPLICATIONS )
-  set(Calibu_DIR ${Calibu_BINARY_DIR}/src)
+  set(Calibu_DIR ${Calibu_BINARY_DIR})
   add_subdirectory( applications )
   add_subdirectory( examples )
 endif()

diff --git a/src/CalibuConfig.cmake.in b/src/CalibuConfig.cmake.in
diff --git a/src/CalibuConfigVersion.cmake.in b/src/CalibuConfigVersion.cmake.in