11

.gitignore

-./.vscode

src/udsf_app/yuan--CMakeLists.txt

@@ -8,21 +8,21 @@ include(ExternalProject)
 
 set(EXTERNAL_INSTALL_LOCATION ${CMAKE_CURRENT_SOURCE_DIR}/external)
 
-#ExternalProject_Add(PISTACHE
-#	SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external/include/pistache
-#	 BINARY_DIR ${CMAKE_CURRENT_SOURCE_DIR}//external/include/pistache
-##    GIT_REPOSITORY https://github.com/oktal/pistache.git
-##  GIT_REPOSITORY https://github.com/pistacheio/pistache
-#    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTERNAL_INSTALL_LOCATION}
-#)
-
-#ExternalProject_Add(NLOHMANN
-#	SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external/include/json
-#	BINARY_DIR ${CMAKE_CURRENT_SOURCE_DIR}//external/include/json
-##    GIT_REPOSITORY https://github.com/nlohmann/json.git
-#    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTERNAL_INSTALL_LOCATION}
-
-#)
+ExternalProject_Add(PISTACHE
+	SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external/include/pistache
+	 BINARY_DIR ${CMAKE_CURRENT_SOURCE_DIR}//external/include/pistache
+    GIT_REPOSITORY https://github.com/oktal/pistache.git
+  GIT_REPOSITORY https://github.com/pistacheio/pistache
+    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTERNAL_INSTALL_LOCATION}
+)
+
+ExternalProject_Add(NLOHMANN
+	SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external/include/json
+	BINARY_DIR ${CMAKE_CURRENT_SOURCE_DIR}//external/include/json
+    GIT_REPOSITORY https://github.com/nlohmann/json.git
+    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTERNAL_INSTALL_LOCATION}
+
+)
 include_directories(${EXTERNAL_INSTALL_LOCATION}/include)
 link_directories(${EXTERNAL_INSTALL_LOCATION}/lib)
 
@@ -38,5 +38,5 @@ file(GLOB SRCS
 )
 
 add_executable(${PROJECT_NAME} ${SRCS} )
-#add_dependencies(${PROJECT_NAME} PISTACHE NLOHMANN)
+add_dependencies(${PROJECT_NAME} PISTACHE NLOHMANN)
 target_link_libraries(${PROJECT_NAME} pistache pthread)