From df21e21085f278095662f3aa2672d9c41760505b Mon Sep 17 00:00:00 2001
From: Nimetu <nimetu@gmail.com>
Date: Tue, 26 Nov 2019 11:43:23 +0200
Subject: [PATCH] Fixed: nelmisc linker error

--HG--
branch : develop
---
 code/CMakeLists.txt              | 3 ++-
 code/nel/src/gui/CMakeLists.txt  | 4 ++--
 code/nel/src/misc/CMakeLists.txt | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
index 46900daa6..71910d8f7 100644
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@@ -220,6 +220,8 @@ IF(WITH_NEL)
 
   IF(WITH_GUI)
     FIND_PACKAGE(Luabind REQUIRED)
+  ENDIF()
+
     FIND_PACKAGE(CURL REQUIRED)
 
     IF((WIN32 OR CURL_LIBRARIES MATCHES "\\.a") AND WITH_STATIC_CURL)
@@ -269,7 +271,6 @@ IF(WITH_NEL)
         ENDIF()
       ENDIF()
     ENDIF()
-  ENDIF()
 
   INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/nel/include)
   ADD_SUBDIRECTORY(nel)
diff --git a/code/nel/src/gui/CMakeLists.txt b/code/nel/src/gui/CMakeLists.txt
index cb7bbe23a..19c0cfea8 100644
--- a/code/nel/src/gui/CMakeLists.txt
+++ b/code/nel/src/gui/CMakeLists.txt
@@ -6,9 +6,9 @@ SOURCE_GROUP("src" FILES ${SRC})
 
 NL_TARGET_LIB(nelgui ${SRC} ${HEADERS})
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${LUA_INCLUDE_DIR} ${LUABIND_INCLUDE_DIR} ${CURL_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIR})
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${LUA_INCLUDE_DIR} ${LUABIND_INCLUDE_DIR} ${CURL_INCLUDE_DIRS})
 
-TARGET_LINK_LIBRARIES(nelgui nelmisc nel3d ${LUA_LIBRARIES} ${LUABIND_LIBRARIES} ${CURL_LIBRARIES} ${OPENSSL_LIBRARIES})
+TARGET_LINK_LIBRARIES(nelgui nelmisc nel3d ${LUA_LIBRARIES} ${LUABIND_LIBRARIES} ${CURL_LIBRARIES})
 
 NL_DEFAULT_PROPS(nelgui "NeL, Library: NeL GUI")
 NL_ADD_RUNTIME_FLAGS(nelgui)
diff --git a/code/nel/src/misc/CMakeLists.txt b/code/nel/src/misc/CMakeLists.txt
index ec0dcd357..e8470983c 100644
--- a/code/nel/src/misc/CMakeLists.txt
+++ b/code/nel/src/misc/CMakeLists.txt
@@ -209,15 +209,15 @@ IF(UNIX)
   ENDIF()
 ENDIF()
 
-INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR} config_file)
+INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR} ${CURL_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIR} config_file)
 
-TARGET_LINK_LIBRARIES(nelmisc ${CMAKE_THREAD_LIBS_INIT} ${LIBXML2_LIBRARIES} ${ZLIB_LIBRARY})
+TARGET_LINK_LIBRARIES(nelmisc ${CMAKE_THREAD_LIBS_INIT} ${LIBXML2_LIBRARIES} ${ZLIB_LIBRARY} ${CURL_LIBRARIES} ${OPENSSL_LIBRARIES})
 NL_DEFAULT_PROPS(nelmisc "NeL, Library: NeL Misc")
 NL_ADD_RUNTIME_FLAGS(nelmisc)
 
 NL_ADD_LIB_SUFFIX(nelmisc)
 
-ADD_DEFINITIONS(${LIBXML2_DEFINITIONS})
+ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} ${CURL_DEFINITIONS} )
 
 IF(WITH_PCH)
   ADD_NATIVE_PRECOMPILED_HEADER(nelmisc ${CMAKE_CURRENT_SOURCE_DIR}/stdmisc.h ${CMAKE_CURRENT_SOURCE_DIR}/stdmisc.cpp)