Changed CMake to submodule. Fixes for CPack and install exporting exa…

…mples code. Clean-ups.

.gitignore

@@ -4,7 +4,6 @@ doc/html
 doc/latex
 *Makefile*
 *.orig
-CMake/common
 .ciscript
 ci.*
 jambs*

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "CMake/common"]
+	path = CMake/common
+	url = https://github.com/Eyescale/CMake

CMake/CPackConfig.cmake

@@ -1,7 +1,6 @@
 set(CPACK_PACKAGE_CONTACT "Pablo Toharia <pablo.toharia@urjc.es>")
 set(CPACK_PACKAGE_DESCRIPTION_FILE "${PROJECT_SOURCE_DIR}/README.md")
-set(CPACK_PACKAGE_LICENSE "Proprietary")
 
-set(CPACK_DEBIAN_PACKAGE_DEPENDS "")
+set(CPACK_DEBIAN_PACKAGE_DEPENDS "libeigen3-dev qtbase5-dev")
 
 include(CommonCPack)

CMakeLists.txt

@@ -1,7 +1,7 @@
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 #
-#   NSOL - NeuroScience Ontology Library
-#   2014 (c) GMRV / Universidad Rey Juan Carlos
+#   NSOL - NeuroScience Objects Library
+#   2014-2017 (c) GMRV / URJC
 #   gmrv@gmrv.es
 #   www.gmrv.es
 #
@@ -28,15 +28,8 @@ endif()
 
 include(GitExternal)
 
-# nsol version
-set(LAST_RELEASE 0.0.0)
-set(VERSION_MAJOR "0")
-set(VERSION_MINOR "1")
-set(VERSION_PATCH "1")
-set(VERSION_ABI 2)
-
 # description
-set(NSOL_DESCRIPTION "Nsol - Neuroscience Ontology Library")
+set(NSOL_DESCRIPTION "Nsol - Neuroscience Objects Library")
 set(COMMON_PROJECT_DOMAIN gmrv.es)
 
 option( NSOL_WITH_EXAMPLES "NSOL_WITH_EXAMPLES" ON )
@@ -84,17 +77,17 @@ endif( )
 
 common_find_package_post()
 
-# library subdirectory
 add_subdirectory(nsol)
-
-# tests subdirectory
 add_subdirectory(tests)
-
-# examples subdirectory
 add_subdirectory(examples)
-
-# examples subdirectory
 add_subdirectory(testData)
 
-include(CPackConfig)
+set(DOCS README.md LICENSE.txt)
+install( FILES ${DOCS} DESTINATION share/nsol COMPONENT dev)
+
+set(DOXYGEN_MAINPAGE_MD README.md )
+set(DOXYGEN_EXTRA_INPUT ${PROJECT_SOURCE_DIR}/README.md)
 include(DoxygenRule)
+
+include(CPackConfig)
+include(CTest)

README.md

@@ -16,8 +16,13 @@ and writers to load dataset and to store them.
 
 ## Dependencies
 
-Required dependencies: Eigen3
-Optional dependencies: FiReS (*1), Brion (*1) and Boost's Unit Test Framework and Qt5Core
+* Required dependencies:
+    * Eigen3
+* Optional dependencies:
+    * FiReS (*1)
+    * Brion (*1)
+    * Boost's Unit Test Framework
+    * Qt5Core
 
 (*1) This dependencies can be built uncommenting theirs corresponding line in the file .gitsubprojects
 

examples/CMakeLists.txt

@@ -7,60 +7,78 @@ if ( NSOL_WITH_EXAMPLES )
     set( NSOLBRIONMORPHOLOGYREADER_SOURCES brionMorphologyReader.cpp )
     set( NSOLBRIONMORPHOLOGYREADER_LINK_LIBRARIES nsol )
     common_application( nsolBrionMorphologyReader )
+    list( APPEND NSOL_EXAMPLES_FILES ${NSOLBRIONMORPHOLOGYREADER_SOURCES} )
 
     set( NSOLBRIONCIRCUITLOADER_SOURCES brionCircuitLoader.cpp )
     set( NSOLBRIONCIRCUITLOADER_LINK_LIBRARIES nsol )
     common_application( nsolBrionCircuitLoader )
+    list( APPEND NSOL_EXAMPLES_FILES ${NSOLBRIONCIRCUITLOADER_SOURCES} )
 
     set( NSOLCONNECTIVITYMATRIX_SOURCES nsolConnectivityMatrix.cpp )
     set( NSOLCONNECTIVITYMATRIX_LINK_LIBRARIES nsol )
     common_application( nsolConnectivityMatrix )
+    list( APPEND NSOL_EXAMPLES_FILES ${NSOLCONNECTIVITYMATRIX_SOURCES} )
 
     set( NSOLCIRCUITLOADERSUMMARY_SOURCES nsolCircuitLoaderSummary.cpp )
     set( NSOLCIRCUITLOADERSUMMARY_LINK_LIBRARIES nsol )
     common_application( nsolCircuitLoaderSummary )
+    list( APPEND NSOL_EXAMPLES_FILES ${NSOLCIRCUITLOADERSUMMARY_SOURCES} )
   endif( )
 
   set( NSOLEXTRACTNEURONSTATS_SOURCES extractNeuronStats.cpp )
   set( NSOLEXTRACTNEURONSTATS_LINK_LIBRARIES nsol )
   common_application( nsolExtractNeuronStats )
+  list( APPEND NSOL_EXAMPLES_FILES ${NSOLEXTRACTNEURONSTATS_SOURCES} )
 
   set( NSOLSECTIONSTATS_SOURCES sectionStats.cpp )
   set( NSOLSECTIONSTATS_LINK_LIBRARIES nsol )
   common_application( nsolSectionStats )
+  list( APPEND NSOL_EXAMPLES_FILES ${NSOLSECTIONSTATS_SOURCES} )
 
   set( NSOLRADIUSSTAT_SOURCES radiusStat.cpp )
   set( NSOLRADIUSSTAT_LINK_LIBRARIES nsol )
   common_application( nsolRadiusStat )
+  list( APPEND NSOL_EXAMPLES_FILES ${NSOLRADIUSSTAT_SOURCES} )
 
   set( NSOLNEURITESTATS_SOURCES neuriteStats.cpp )
   set( NSOLNEURITESTATS_LINK_LIBRARIES nsol )
   common_application( nsolNeuriteStats )
+  list( APPEND NSOL_EXAMPLES_FILES ${NSOLNEURITESTATS_SOURCES} )
 
   set( NSOLNEURONSTATS_SOURCES neuronStats.cpp )
   set( NSOLNEURONSTATS_LINK_LIBRARIES nsol )
   common_application( nsolNeuronStats )
+  list( APPEND NSOL_EXAMPLES_FILES ${NSOLNEURONSTATS_SOURCES} )
 
   set( NSOLMINICOLUMNSTATS_SOURCES miniColumnStats.cpp )
   set( NSOLMINICOLUMNSTATS_LINK_LIBRARIES nsol )
   common_application( nsolMiniColumnStats )
+  list( APPEND NSOL_EXAMPLES_FILES ${NSOLMINICOLUMNSTATS_SOURCES} )
 
   set( NSOLDATASET_SOURCES dataset.cpp )
   set( NSOLDATASET_LINK_LIBRARIES nsol )
   common_application( nsolDataset )
+  list( APPEND NSOL_EXAMPLES_FILES ${NSOLDATASET_SOURCES} )
 
   set( NSOLSIMPLIFIER_SOURCES simplifier.cpp )
   set( NSOLSIMPLIFIER_LINK_LIBRARIES nsol )
   common_application( nsolSimplifier )
+  list( APPEND NSOL_EXAMPLES_FILES ${NSOLSIMPLIFIER_SOURCES} )
 
   set( NSOLBLUECONFIG2XMLSCENE_SOURCES blueConfig2XmlScene.cpp )
   set( NSOLBLUECONFIG2XMLSCENE_LINK_LIBRARIES nsol )
   common_application( nsolBlueConfig2XmlScene )
+  list( APPEND NSOL_EXAMPLES_FILES ${NSOLBLUECONFIG2XMLSCENE_SOURCES} )
 
   if ( QT5CORE_FOUND )
     set( NSOLSCENE_SOURCES scene.cpp )
     set( NSOLSCENE_LINK_LIBRARIES nsol )
     common_application( nsolScene )
+    list( APPEND NSOL_EXAMPLES_FILES ${NSOLSCENE_SOURCES} )
   endif( )
 
+  include(InstallFiles)
+  install_files(share/nsol/examples FILES ${NSOL_EXAMPLES_FILES} COMPONENT
+    examples )
+
 endif( NSOL_WITH_EXAMPLES )