moved libs (#36)

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "python/pybind11"]
-	path = python/pybind11
+	path = libs/pybind11
 	url = https://github.com/pybind/pybind11.git

CMakeLists.txt

@@ -109,9 +109,14 @@ if(SLS_USE_SANITIZER)
     # target_link_libraries(slsProjectOptions INTERFACE -fsanitize=thread)
 endif()
 
+#rapidjson
+add_library(rapidjson INTERFACE)
+target_include_directories(rapidjson INTERFACE
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/libs/rapidjson>  
+)
 
 # Install fake the libraries
-install(TARGETS slsProjectOptions slsProjectWarnings
+install(TARGETS slsProjectOptions slsProjectWarnings rapidjson
     EXPORT "${TARGETS_EXPORT_NAME}"
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
@@ -132,6 +137,9 @@ if (SLS_USE_TESTS)
     add_subdirectory(tests)
 endif(SLS_USE_TESTS)
 
+
+
+
 # Common functionallity to detector and receiver
 add_subdirectory(slsSupportLib)
 
@@ -165,6 +173,7 @@ if (SLS_USE_INTEGRATION_TESTS)
 endif (SLS_USE_INTEGRATION_TESTS)
 
 if (SLS_USE_PYTHON)
+    add_subdirectory(libs/pybind11)
     add_subdirectory(python)
 endif(SLS_USE_PYTHON)
 

python/CMakeLists.txt

@@ -1,4 +1,4 @@
-add_subdirectory(pybind11)
+
 pybind11_add_module(_sls_detector src/main.cpp)
 
 

slsSupportLib/CMakeLists.txt

@@ -53,7 +53,10 @@ set_target_properties(slsSupportLib PROPERTIES
     PUBLIC_HEADER "${PUBLICHEADERS}"
 )
 
-target_link_libraries(slsSupportLib slsProjectOptions slsProjectWarnings)
+target_link_libraries(slsSupportLib 
+    slsProjectOptions 
+    slsProjectWarnings 
+    rapidjson)
 
 if (SLS_USE_TESTS)
     add_subdirectory(tests)

tests/CMakeLists.txt

@@ -1,5 +1,5 @@
 include_directories(
-    ${PROJECT_SOURCE_DIR}/catch
+    ${PROJECT_SOURCE_DIR}/libs/catch
     include
 )