clean up cmakelists.txt

6 years ago · fe38ab6a5a
parent c3c388b6aa
commit fe38ab6a5a
1 changed files with 46 additions and 40 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -144,11 +144,7 @@ else()
  )
 endif()

-find_package(OpenSSL)
-
-include_directories(${OPENSSL_INCLUDE_DIR})
-
-set(LIBS ${SODIUM_LIB} ${THREAD_LIB} ${OPENSSL_LIBRARIES})
+set(LIBS ${SODIUM_LIB} ${THREAD_LIB})

 set(LIB lokinet)
 set(SHARED_LIB ${LIB})
@ -369,6 +365,10 @@ set(LIB_SRC

 )

+set(RC_SRC
+  daemon/rcutil.cpp
+)
+
 set(DNS_SRC
  llarp/dns.cpp
  llarp/dnsc.cpp
@ -396,7 +396,7 @@ set(CLIENT_SRC
  client/main.cpp
 )

-set(ALL_SRC ${CLIENT_SRC} daemon/rcutil.cpp ${EXE_SRC} ${DNS_SRC} ${LIB_PLATFORM_SRC} ${LIB_SRC} ${TEST_SRC} ${CPP_BACKPORT_SRC})
+set(ALL_SRC ${CLIENT_SRC} ${RC_SRC} ${EXE_SRC} ${DNS_SRC} ${LIB_PLATFORM_SRC} ${LIB_SRC} ${TEST_SRC} ${CPP_BACKPORT_SRC})

 foreach(F ${ALL_SRC})
 set_source_files_properties(${F} PROPERTIES COMPILE_FLAGS -DLOG_TAG=\\\"${F}\\\")
@ -405,12 +405,14 @@ endforeach(F)
 set(LIB lokinet)
 set(SHARED_LIB ${LIB})
 set(STATIC_LIB ${LIB}-static)
+set(BACKPORT_LIB ${LIB}-backport)
+set(PLATFORM_LIB ${LIB}-platform)
+set(ANDROID_LIB ${LIB}android)

 # TODO: exclude this from includes and expose stuff properly for rcutil
 include_directories(llarp)
 include_directories(include)
 include_directories(vendor/cppbackport-master/lib)
-#include_directories(/usr/local/include)
 include_directories(${sodium_INCLUDE_DIR})

 if (WIN32 AND NOT MINGW)
@ -418,15 +420,19 @@ include_directories(contrib/msc/include)
 link_directories(contrib/msc/lib)
 endif()

+set(RC_EXE rcutil)
+set(DNS_EXE dns)
+
+
 if(SHADOW)
  add_shadow_plugin(shadow-plugin-${SHARED_LIB} ${EXE_SRC} ${LIB_SRC} ${LIB_PLATFORM_SRC} ${CPP_BACKPORT_SRC})
  target_link_libraries(shadow-plugin-${SHARED_LIB} ${LIBS})
  install(TARGETS shadow-plugin-${SHARED_LIB} DESTINATION plugins)
 else()
-  add_executable(rcutil daemon/rcutil.cpp)
+  add_executable(${RC_EXE} ${RC_SRC})
  add_executable(${EXE} ${EXE_SRC})
  add_executable(${CLIENT_EXE} ${CLIENT_SRC})
-  add_executable(dns ${DNS_SRC})
+  add_executable(${DNS_EXE} ${DNS_SRC})


  if(NOT WIN32)
@ -438,57 +444,57 @@ else()
  if(WITH_STATIC)
    add_library(${STATIC_LIB} STATIC ${LIB_SRC})
    if(NOT HAVE_CXX17_FILESYSTEM)
-      add_library(backport-static STATIC ${CPP_BACKPORT_SRC})
+      add_library(${BACKPORT_LIB} STATIC ${CPP_BACKPORT_SRC})
    endif(NOT HAVE_CXX17_FILESYSTEM)
-    add_library(llarpplatform-static STATIC ${LIB_PLATFORM_SRC})
-    target_link_libraries(llarpplatform-static ${THREAD_LIB})
+    add_library(${PLATFORM_LIB} STATIC ${LIB_PLATFORM_SRC})
+    target_link_libraries(${PLATFORM_LIB} ${THREAD_LIB})
    if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-      target_link_libraries(llarpplatform-static -lcap)
+      target_link_libraries(${PLATFORM_LIB} -lcap)
    endif()
    if(NOT HAVE_CXX17_FILESYSTEM)
-      target_link_libraries(${STATIC_LIB} ${LIBS} backport-static llarpplatform-static)
+      target_link_libraries(${STATIC_LIB} ${LIBS} ${PLATFORM_LIB} ${PLATFORM_LIB})
    else()
-      target_link_libraries(${STATIC_LIB} ${LIBS} llarpplatform-static)
+      target_link_libraries(${STATIC_LIB} ${LIBS} ${PLATFORM_LIB})
    endif(NOT HAVE_CXX17_FILESYSTEM)
    if(NOT WITH_SHARED)
      if(NOT HAVE_CXX17_FILESYSTEM)
-        target_link_libraries(${EXE} ${STATIC_LINK_LIBS} ${STATIC_LIB} backport-static llarpplatform-static)
-        target_link_libraries(${CLIENT_EXE} ${STATIC_LINK_LIBS} ${STATIC_LIB} backport-static llarpplatform-static)
-        target_link_libraries(rcutil ${STATIC_LINK_LIBS} ${STATIC_LIB} backport-static llarpplatform-static)
+        target_link_libraries(${EXE} ${STATIC_LINK_LIBS} ${STATIC_LIB} ${BACKPORT_LIB} ${PLATFORM_LIB})
+        target_link_libraries(${CLIENT_EXE} ${STATIC_LINK_LIBS} ${STATIC_LIB} ${BACKPORT_LIB} ${PLATFORM_LIB})
+        target_link_libraries(${RC_EXE} ${STATIC_LINK_LIBS} ${STATIC_LIB} ${BACKPORT_LIB} ${PLATFORM_LIB})
        if (MINGW)
-          target_link_libraries(${EXE} ${STATIC_LINK_LIBS} ${STATIC_LIB} backport-static llarpplatform-static ws2_32 stdc++fs iphlpapi)
-          target_link_libraries(${CLIENT_EXE} ${STATIC_LINK_LIBS} ${STATIC_LIB} backport-static llarpplatform-static ws2_32 stdc++fs iphlpapi)
-          target_link_libraries(rcutil ${STATIC_LINK_LIBS} ${STATIC_LIB} backport-static llarpplatform-static ws2_32 stdc++fs iphlpapi)
+          target_link_libraries(${EXE} ${STATIC_LINK_LIBS} ${STATIC_LIB} ${BACKPORT_LIB} ${PLATFORM_LIB} ws2_32 stdc++fs iphlpapi)
+          target_link_libraries(${CLIENT_EXE} ${STATIC_LINK_LIBS} ${STATIC_LIB} ${BACKPORT_LIB} ${PLATFORM_LIB} ws2_32 stdc++fs iphlpapi)
+          target_link_libraries(${RC_EXE} ${STATIC_LINK_LIBS} ${STATIC_LIB} ${BACKPORT_LIB} ${PLATFORM_LIB} ws2_32 stdc++fs iphlpapi)
        elseif(WIN32)
-          target_link_libraries(${EXE} ${STATIC_LINK_LIBS} ${STATIC_LIB} backport-static llarpplatform-static ws2_32 iphlpapi)
-          target_link_libraries(${CLIENT_EXE} ${STATIC_LINK_LIBS} ${STATIC_LIB} backport-static llarpplatform-static ws2_32 iphlpapi)
-          target_link_libraries(rcutil ${STATIC_LINK_LIBS} ${STATIC_LIB} backport-static llarpplatform-static ws2_32 iphlpapi)
+          target_link_libraries(${EXE} ${STATIC_LINK_LIBS} ${STATIC_LIB} ${BACKPORT_LIB} ${PLATFORM_LIB} ws2_32 iphlpapi)
+          target_link_libraries(${CLIENT_EXE} ${STATIC_LINK_LIBS} ${STATIC_LIB} ${BACKPORT_LIB} ${PLATFORM_LIB} ws2_32 iphlpapi)
+          target_link_libraries(${RC_EXE} ${STATIC_LINK_LIBS} ${STATIC_LIB} ${BACKPORT_LIB} ${PLATFORM_LIB} ws2_32 iphlpapi)
        endif(MINGW)
      else()
-        target_link_libraries(${EXE} ${STATIC_LINK_LIBS} ${STATIC_LIB} llarpplatform-static)
-        target_link_libraries(${CLIENT_EXE} ${STATIC_LINK_LIBS} ${STATIC_LIB} llarpplatform-static)
-        target_link_libraries(rcutil ${STATIC_LINK_LIBS} ${STATIC_LIB} llarpplatform-static)
+        target_link_libraries(${EXE} ${STATIC_LINK_LIBS} ${STATIC_LIB} ${PLATFORM_LIB})
+        target_link_libraries(${CLIENT_EXE} ${STATIC_LINK_LIBS} ${STATIC_LIB} ${PLATFORM_LIB})
+        target_link_libraries(${RC_EXE} ${STATIC_LINK_LIBS} ${STATIC_LIB} ${PLATFORM_LIB})
        if (MINGW)
-          target_link_libraries(${EXE} ${STATIC_LINK_LIBS} ${STATIC_LIB} llarpplatform-static ws2_32 stdc++fs iphlpapi)
-          target_link_libraries(${CLIENT_EXE} ${STATIC_LINK_LIBS} ${STATIC_LIB} llarpplatform-static ws2_32 stdc++fs iphlpapi)
-          target_link_libraries(rcutil ${STATIC_LINK_LIBS} ${STATIC_LIB} llarpplatform-static ws2_32 stdc++fs iphlpapi)
+          target_link_libraries(${EXE} ${STATIC_LINK_LIBS} ${STATIC_LIB} ${PLATFORM_LIB} ws2_32 stdc++fs iphlpapi)
+          target_link_libraries(${CLIENT_EXE} ${STATIC_LINK_LIBS} ${STATIC_LIB} ${PLATFORM_LIB} ws2_32 stdc++fs iphlpapi)
+          target_link_libraries(${RC_EXE} ${STATIC_LINK_LIBS} ${STATIC_LIB} ${PLATFORM_LIB} ws2_32 stdc++fs iphlpapi)
        elseif(WIN32)
-          target_link_libraries(${EXE} ${STATIC_LINK_LIBS} ${STATIC_LIB} llarpplatform-static ws2_32 iphlpapi)
-          target_link_libraries(${CLIENT_EXE} ${STATIC_LINK_LIBS} ${STATIC_LIB} llarpplatform-static ws2_32 iphlpapi)
-          target_link_libraries(rcutil ${STATIC_LINK_LIBS} ${STATIC_LIB} llarpplatform-static ws2_32 iphlpapi)
+          target_link_libraries(${EXE} ${STATIC_LINK_LIBS} ${STATIC_LIB} ${PLATFORM_LIB} ws2_32 iphlpapi)
+          target_link_libraries(${CLIENT_EXE} ${STATIC_LINK_LIBS} ${STATIC_LIB} ${PLATFORM_LIB} ws2_32 iphlpapi)
+          target_link_libraries(${RC_EXE} ${STATIC_LINK_LIBS} ${STATIC_LIB} ${PLATFORM_LIB} ws2_32 iphlpapi)
        endif(MINGW)
      endif(NOT HAVE_CXX17_FILESYSTEM)
      if (MINGW)
-        target_link_libraries(dns ${STATIC_LIB} llarpplatform-static ${THREAD_LIB} ws2_32 stdc++fs iphlpapi)
+        target_link_libraries(${DNS_EXE} ${STATIC_LIB} ${PLATFORM_LIB} ${THREAD_LIB} ws2_32 stdc++fs iphlpapi)
      elseif(WIN32)
-        target_link_libraries(dns ${STATIC_LIB} llarpplatform-static ${THREAD_LIB} ws2_32 iphlpapi)
+        target_link_libraries(${DNS_EXE} ${STATIC_LIB} ${PLATFORM_LIB} ${THREAD_LIB} ws2_32 iphlpapi)
      endif(MINGW)
-      target_link_libraries(dns ${STATIC_LIB} llarpplatform-static ${THREAD_LIB})
+      target_link_libraries(${DNS_EXE} ${STATIC_LIB} ${PLATFORM_LIB} ${THREAD_LIB})
    endif(NOT WITH_SHARED)
  endif(WITH_STATIC)
  if(ANDROID)
-    add_library(lokinetandroid SHARED jni/lokinet_android.cpp)
-    target_link_libraries(lokinetandroid ${STATIC_LIB} ${LIBS} log)
+    add_library(${ANDROID_LIB} SHARED jni/lokinet_android.cpp)
+    target_link_libraries(${ANDROID_LIB} ${STATIC_LIB} ${LIBS} log)
  endif()

  if(WITH_SHARED)
@ -503,7 +509,7 @@ else()
    endif(MINGW)
    target_link_libraries(${SHARED_LIB} ${LIBS} ${THREAD_LIB})
    target_link_libraries(${EXE} ${SHARED_LIB})
-    target_link_libraries(rcutil ${SHARED_LIB})
-    target_link_libraries(dns ${SHARED_LIB} ${THREAD_LIB})
+    target_link_libraries(${RC_EXE} ${SHARED_LIB})
+    target_link_libraries(${DNS_EXE} ${SHARED_LIB} ${THREAD_LIB})
  endif(WITH_SHARED)
 endif(SHADOW)