Procházet zdrojové kódy

Changed to log() <<. Fixed up CMakeList.

Added better messages for missing libraries.
Steve Thielemann před 4 roky
rodič
revize
b84e25232a
2 změnil soubory, kde provedl 15 přidání a 2 odebrání
  1. 13 0
      CMakeLists.txt
  2. 2 2
      main.cpp

+ 13 - 0
CMakeLists.txt

@@ -26,6 +26,13 @@ set(CMAKE_CXX_STANDARD   14)
 # set(CMAKE_CXX_STANDARD   17)
 set(CMAKE_CXX_EXTENSIONS ON)
 
+if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/door++)
+  message("***")
+  message("*** ERROR/MISSING *** please run: git clone ssh://gitredgreen/RedGreen/bzdoor.git")
+  message("*** (Or whatever git clone you need for door++)")
+  message("***")
+endif()
+
 add_subdirectory(door++)
 
 file(GLOB IMAGES
@@ -40,6 +47,12 @@ add_custom_command(
     WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
 )
 
+if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/SQLiteCpp)
+  message("***")
+  message("*** ERROR/MISSING *** please run: git clone https://github.com/SRombauts/SQLiteCpp.git")
+  message("***")
+endif()
+
 set(SQLITECPP_RUN_CPPCHECK OFF CACHE BOOL "" FORCE)
 set(SQLITECPP_RUN_CPPLINT OFF CACHE BOOL "" FORCE)
 add_subdirectory(SQLiteCpp)

+ 2 - 2
main.cpp

@@ -451,12 +451,12 @@ int main(int argc, char *argv[]) {
   if (r < 0) {
   TIMEOUT:
     if (r == -1) {
-      door.log("TIMEOUT");
+      door.log() << "TIMEOUT" << std::endl;
 
       door << timeout << door::reset << door::nl << door::nl;
     } else {
       if (r == -3) {
-        door.log("OUTTA TIME");
+        door.log() << "OUTTA TIME" << std::endl;
         door::Panel notime = make_notime(mx, my);
         door << notime << door::reset << door::nl;
       }