npub16w…msx3e on Nostr: commit bb055c203ef9e4c06eb638812f5873c223dac439 Author: @RandyMcMillan ...

commit bb055c203ef9e4c06eb638812f5873c223dac439
Author: @RandyMcMillan <[email protected]>
Date: Tue Mar 19 12:32:40 2024 -0400

CMakeLists.txt:web/CMakeLists.txt:intermediate

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1fbd93a39..f859583f0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,17 +10,22 @@ endif()
set(CMAKE_BUILD_TYPE Debug)
project (nostr_client_relay LANGUAGES CXX C)

+
+SET(VERSION_SERIES 0)
+SET(VERSION_MAJOR 0)
+SET(VERSION_MINOR 24)
+
option(BUILD_RELEASE "BUILD_RELEASE" ON)

if(BUILD_RELEASE)
set(CMAKE_BUILD_TYPE Release)
endif()

+option(DEV_MODE "DEV_MODE" ON)
option(BUILD_STATIC "BUILD_STATIC" ON)
-option(BUILD_GUI "BUILD_STATIC" OFF)
+option(BUILD_GUI "BUILD_GUI" OFF)
option(BUILD_WEB "BUILD_WEB" OFF)
option(USE_OPENSSL "set OFF to build without OpenSSL" ON)
-option(DEV_MODE "DEV_MODE" OFF)
option(OPENSSL_BREW "OPENSSL_BREW" ON)

if(MSVC)
@@ -50,13 +55,19 @@ add_subdirectory(${CMAKE_SOURCE_DIR}/ext/curl-8.5.0)
add_subdirectory(${CMAKE_SOURCE_DIR}/src/libcjson)

if(BUILD_WEB)
-if(MSVC)
-if(DEV_MODE)
set(BOOST_PREFIX ${CMAKE_SOURCE_DIR}/ext/boost_1_82_0)
add_subdirectory(${CMAKE_SOURCE_DIR}/ext/wt-4.10.0)
add_definitions(-DDEV_MODE)
endif()
+if(MSVC)
+ set(BOOST_PREFIX ${CMAKE_SOURCE_DIR}/ext/boost_1_82_0)
+ add_subdirectory(${CMAKE_SOURCE_DIR}/ext/wt-4.10.0)
+ add_definitions(-DDEV_MODE)
endif()
+if(DEV_MODE)
+ #set(BOOST_PREFIX ${CMAKE_SOURCE_DIR}/ext/boost_1_82_0)
+ #add_subdirectory(${CMAKE_SOURCE_DIR}/ext/wt-4.10.0)
+ #add_definitions(-DDEV_MODE)
endif()

#//////////////////////////
@@ -301,9 +312,9 @@ if(MSVC)
message(STATUS "MSVC: ${MSVC}")
if(DEV_MODE)
message(STATUS "DEV_MODE: ${DEV_MODE}")
- set_target_properties(wt PROPERTIES FOLDER "wt")
- set_target_properties(wthttp PROPERTIES FOLDER "wt")
- set_target_properties(wtisapi PROPERTIES FOLDER "wt")
+ set_target_properties(wt PROPERTIES FOLDER "wt")
+ set_target_properties(wthttp PROPERTIES FOLDER "wt")
+ set_target_properties(wtisapi PROPERTIES FOLDER "wt")
endif()
endif()
endif()
diff --git a/web/CMakeLists.txt b/web/CMakeLists.txt
index 80a0bb9ec..6e7c9f5d3 100644
--- a/web/CMakeLists.txt
+++ b/web/CMakeLists.txt
@@ -2,6 +2,10 @@
# Copyright (c) 2023, Space Research Software LLC, Pedro Vicente. All rights reserved.
# See file LICENSE for full license details.

+include_directories(${CMAKE_SOURCE_DIR}/ext/boost_1_82_0)
+include_directories(${CMAKE_SOURCE_DIR}/ext/wt-4.10.0)
+add_definitions(-DDEV_MODE)
+
message(STATUS "WT_INCLUDE: " ${WT_INCLUDE})
message(STATUS "WT_CONFIG_H: " ${WT_CONFIG_H})
message(STATUS "Source directory is " ${CMAKE_SOURCE_DIR})
@@ -22,7 +26,7 @@ set(web ${web} home.cc)
set(web ${web} follows.hh)
set(web ${web} follows.cc)

-add_executable(gnostr-web web.cc web.hh ${web})
+#add_executable(gnostr-web web.cc web.hh ${web})

#//////////////////////////
#link with libraries
@@ -40,16 +44,18 @@ if (MSVC)
set(lib_web ${lib_web} ${BOOST_LIB_DIRS}/libboost_program_options-vc143-mt-gd-x64-1_82.lib)
endif()

-if(APPLE)
- #//set(lib_web ${lib_web} ${CMAKE_SOURCE_DIR}/ext/wt-4.10.0/lib/libwt.dylib)
- #//set(lib_web ${lib_web} ${CMAKE_SOURCE_DIR}/ext/wt-4.10.0/lib/libwthttp.dylib)
- set(lib_web ${lib_web} /usr/local/lib/libwt.dylib)
- set(lib_web ${lib_web} /usr/local/lib/libwthttp.dylib)
- set(BOOST_LIB_DIRS /usr/local/lib)
+
+
+#if(APPLE)
+#set(lib_web ${lib_web} /usr/local/lib/libwt.dylib)
+#set(lib_web ${lib_web} /usr/local/lib/libwthttp.dylib)
+ set(lib_web ${lib_web} ${CMAKE_SOURCE_DIR}/ext/wt-4.10.0/src/libwt.dylib)
+ set(lib_web ${lib_web} ${CMAKE_SOURCE_DIR}/ext/wt-4.10.0/src/http/libwthttp.dylib)
+ set(BOOST_LIB_DIRS ${CMAKE_SOURCE_DIR}/ext/boost_1_82_0/lib)
set(lib_web ${lib_web} ${BOOST_LIB_DIRS}/libboost_filesystem-mt.a)
set(lib_web ${lib_web} ${BOOST_LIB_DIRS}/libboost_thread-mt.a)
set(lib_web ${lib_web} ${BOOST_LIB_DIRS}/libboost_program_options-mt.a)
-endif()
+#endif()

if (LINUX)
#//set(lib_web ${lib_web} ${CMAKE_SOURCE_DIR}/ext/wt-4.10.0/lib/libwt.so)
@@ -63,8 +69,10 @@ if (LINUX)
endif()

set(lib_web ${lib_web} ${lib_dep})
+add_executable(gnostr-web web.cc web.hh ${web})
target_link_libraries (gnostr-web ${lib_web})

+
message(STATUS "Copying data files to: ${CMAKE_BINARY_DIR}/web")
file(COPY "${CMAKE_SOURCE_DIR}/web/nostro.css" DESTINATION ${CMAKE_BINARY_DIR}/web)
add_custom_target(css SOURCES ${CMAKE_BINARY_DIR}/web/nostro.css)