- adding include dir for include files

- small fix in cmakelists
Zealot111 · Dec 7, 2019 · 61227d3 · 61227d3
1 parent bbde6a6
commit 61227d3
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 1 deletion.
diff --git a/extension/OcapReplaySaver2/CmakeLists.txt b/extension/OcapReplaySaver2/CmakeLists.txt
@@ -15,19 +15,25 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS ON)
 
 set(OCAP_SRC_DIR "./src/")
+set(OCAP_INC_DIR "./include/")
 
 set(SOURCE_LIB "${OCAP_SRC_DIR}/OcapReplaySaver2.cpp"
                "${OCAP_SRC_DIR}/easylogging++.cc"
+               "${OCAP_INC_DIR}/easylogging_setup.h"
+               "${OCAP_INC_DIR}/easylogging++.h"
+               "${OCAP_INC_DIR}/json.hpp"
 )			
 #add_dependencies(OcapReplaySaver2 curl)
 
+include_directories(${OCAP_INC_DIR})
 
 add_definitions(-DCURL_STATICLIB)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/external/curl/include)
 link_directories(${CMAKE_CURRENT_SOURCE_DIR}/external/curl/lib)
 
-add_library(OcapReplaySaver2 SHARED ${SOURCE_LIB})	
+add_library(OcapReplaySaver2 SHARED ${SOURCE_LIB})
 target_link_libraries(OcapReplaySaver2 libcurl crypt32 winmm wldap32 ws2_32)	
+
 
 
 # FIND_PACKAGE(CURL PATHS "C:/Users/User/OCAP/extension/OcapReplaySaver2/curl")

diff --git a/extension/OcapReplaySaver2/cmake-build64.cmd b/extension/OcapReplaySaver2/cmake-build64.cmd
@@ -1,3 +1,5 @@
 mkdir build64
+cd build64
 cmake -G "Visual Studio 14 2015 Win64" ..
+cd ..
 cmake --build build64 --config Release
diff --git a/...sion/OcapReplaySaver2/src/easylogging++.h → .../OcapReplaySaver2/include/easylogging++.h b/...sion/OcapReplaySaver2/src/easylogging++.h → .../OcapReplaySaver2/include/easylogging++.h
diff --git a/.../OcapReplaySaver2/src/easylogging_setup.h → ...pReplaySaver2/include/easylogging_setup.h b/.../OcapReplaySaver2/src/easylogging_setup.h → ...pReplaySaver2/include/easylogging_setup.h
diff --git a/extension/OcapReplaySaver2/src/json.hpp → extension/OcapReplaySaver2/include/json.hpp b/extension/OcapReplaySaver2/src/json.hpp → extension/OcapReplaySaver2/include/json.hpp