Merge branch 'develop'

fixed post-release install glitch
bbercovici · May 15, 2018 · 83bb2ed · 83bb2ed
2 parents c85a864 + 4ca5dbd
commit 83bb2ed
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/SbgatCore/CMakeLists.txt b/SbgatCore/CMakeLists.txt
@@ -140,8 +140,8 @@ target_link_libraries(${LIB_NAME} ${library_dependencies})
 if(NOT BREW)
 	install (TARGETS ${LIB_NAME} DESTINATION /usr/local/lib/)
 	install (DIRECTORY ${PROJECT_SOURCE_DIR}/${LIB_NAME} DESTINATION /usr/local/share)
-	install (DIRECTORY ${PROJECT_SOURCE_DIR}/include/SbgatCore DESTINATION /usr/local/include/ FILES_MATCHING PATTERN "*.hpp")
-	install (DIRECTORY ${PROJECT_SOURCE_DIR}/include/nlohmann DESTINATION /usr/local/include/ FILES_MATCHING PATTERN "*.hpp")
+	install (DIRECTORY ${PROJECT_SOURCE_DIR}/include/SbgatCore DESTINATION /usr/local/include FILES_MATCHING PATTERN "*.hpp")
+	install (DIRECTORY ${PROJECT_SOURCE_DIR}/include/nlohmann DESTINATION /usr/local/include FILES_MATCHING PATTERN "*.hpp")
 endif()
 
 

diff --git a/SbgatCore/include/SbgatCore/SBGATSphericalHarmo.hpp b/SbgatCore/include/SbgatCore/SBGATSphericalHarmo.hpp
@@ -61,7 +61,6 @@ SOFTWARE.
 #include <vtkFiltersCoreModule.h> // For export macro
 #include <vtkPolyDataAlgorithm.h>
 #include <armadillo>
-#include <json.hpp>
 
 class VTKFILTERSCORE_EXPORT SBGATSphericalHarmo : public vtkPolyDataAlgorithm{
 public:

diff --git a/SbgatCore/source/SBGATSphericalHarmo.cpp b/SbgatCore/source/SBGATSphericalHarmo.cpp
@@ -40,6 +40,7 @@ SOFTWARE.
 #include <SBGATSphericalHarmo.hpp>
 #include <SBGATMassProperties.hpp>
 #include <SHARMLib.hpp>
+#include <json.hpp>
 #include <vtkObjectFactory.h>
 #include <vtkCell.h>
 #include <vtkDataObject.h>