Merge pull request #24 from open-space-collective/dev@lucas

Dev@lucas
open-space-collective · Mar 2, 2019 · dea65aa · dea65aa
2 parents 136321d + b12e0b5
commit dea65aa
Show file tree

Hide file tree

Showing 27 changed files with 335 additions and 163 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -29,7 +29,6 @@ OPTION (BUILD_UNIT_TESTS "Build tests" ON)
 OPTION (BUILD_PYTHON_BINDINGS "Build Python bindings." ON)
 OPTION (BUILD_CODE_COVERAGE "Build code coverage" OFF)
 OPTION (BUILD_DOCUMENTATION "Build documentation" OFF)
-OPTION (INSTALL_DATA "Install data" ON)
 
 ################################################################################################################################################################
 
@@ -454,13 +453,9 @@ ADD_CUSTOM_TARGET ("uninstall" COMMAND ${CMAKE_COMMAND} -P "${CMAKE_CURRENT_BINA
 
 INSTALL (FILES "LICENSE" DESTINATION ${INSTALL_ROOT} COMPONENT "documentation")
 
-IF (INSTALL_DATA)
+IF (EXISTS "${PROJECT_SOURCE_DIR}/share")
 
-    IF (EXISTS "${PROJECT_SOURCE_DIR}/share")
-
-        INSTALL (DIRECTORY "${PROJECT_SOURCE_DIR}/share" DESTINATION ${INSTALL_DATA} COMPONENT "data")
-
-    ENDIF ()
+    INSTALL (DIRECTORY "${PROJECT_SOURCE_DIR}/share/" DESTINATION ${INSTALL_DATA} COMPONENT "data")
 
 ENDIF ()
 

diff --git a/bindings/python/docs/Reference.ipynb b/bindings/python/docs/Reference.ipynb
@@ -38,7 +38,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.5"
+   "version": "3.6.7"
   }
  },
  "nbformat": 4,