jiigen666/i2pd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix conflicts

Browse Source
This commit is contained in:
Jeff Becker
2016-11-01 10:02:10 -04:00
parent b4e9ed7d18
commit 9575f70f38
4 changed files with 0 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
build/CMakeLists.txt
View File

@@ -18,13 +18,9 @@ option(WITH_GUI "Include GUI (currently MS Windows only)" ON)
option(WITH_MESHNET "Build for cjdns test network" OFF)
option(WITH_ADDRSANITIZER "Build with address sanitizer unix only" OFF)
option(WITH_THREADSANITIZER "Build with thread sanitizer unix only" OFF)
<<<<<<< HEAD
option(WITH_I2LUA "Build for i2lua" OFF)
=======
option(WITH_WEBSOCKETS "Build with websocket ui" OFF)
>>>>>>> bda4170... add web socket ui
# paths
set ( CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules" )
set ( CMAKE_SOURCE_DIR ".." )
@@ -382,11 +378,8 @@ message(STATUS " PCH : ${WITH_PCH}")
message(STATUS " MESHNET : ${WITH_MESHNET}")
message(STATUS " ADDRSANITIZER : ${WITH_ADDRSANITIZER}")
message(STATUS " THEADSANITIZER : ${WITH_THREADSANITIZER}")
<<<<<<< HEAD
message(STATUS " I2LUA : ${WITH_I2LUA}")
=======
message(STATUS " WEBSOCKETS : ${WITH_WEBSOCKETS}")
>>>>>>> bda4170... add web socket ui
message(STATUS "---------------------------------------")
#Handle paths nicely