Changed: Dependencies definitions

code/nel/src/misc/CMakeLists.txt

@@ -30,15 +30,15 @@ IF(WIN32)
 ENDIF(WIN32)
 
 IF(UNIX)
-  SET(LIBC_LIBRARY -lc)
+  TARGET_LINK_LIBRARIES(nelmisc -lc)
   IF(NOT APPLE)
-    SET(LIBRT_LIBRARY -lrt)
+    TARGET_LINK_LIBRARIES(nelmisc -lrt)
   ENDIF(NOT APPLE)
 ENDIF(UNIX)
 
 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${PNG_INCLUDE_DIR} config_file)
 
-TARGET_LINK_LIBRARIES(nelmisc ${CMAKE_THREAD_LIBS_INIT} ${LIBC_LIBRARY} ${LIBRT_LIBRARY} ${LIBXML2_LIBRARIES})
+TARGET_LINK_LIBRARIES(nelmisc ${CMAKE_THREAD_LIBS_INIT} ${LIBXML2_LIBRARIES})
 SET_TARGET_PROPERTIES(nelmisc PROPERTIES LINK_INTERFACE_LIBRARIES "")
 NL_DEFAULT_PROPS(nelmisc "NeL, Library: NeL Misc")
 

code/nel/src/net/CMakeLists.txt

@@ -13,7 +13,7 @@ ENDIF(WITH_GTK)
 
 TARGET_LINK_LIBRARIES(nelnet nelmisc)
 SET_TARGET_PROPERTIES(nelnet PROPERTIES LINK_INTERFACE_LIBRARIES "")
-NL_DEFAULT_PROPS(nelnet "NeL, Library: Net")
+NL_DEFAULT_PROPS(nelnet "NeL, Library: NeL Net")
 
 NL_ADD_LIB_SUFFIX(nelnet)
 

code/nel/src/sound/driver/CMakeLists.txt

@@ -2,9 +2,14 @@ FILE(GLOB SRC *.cpp *.h)
 
 NL_TARGET_LIB(nelsnd_lowlevel ${SRC})
 
+IF(WITH_STATIC)
+  # Add libogg dependency only if target is static because to libvorbisfile
+  TARGET_LINK_LIBRARIES(nelsnd_lowlevel ${OGG_LIBRARY})
+ENDIF(WITH_STATIC)
+
 INCLUDE_DIRECTORIES(${OGG_INCLUDE_DIR} ${VORBIS_INCLUDE_DIR})
 
-TARGET_LINK_LIBRARIES(nelsnd_lowlevel nelmisc ${VORBIS_LIBRARY} ${VORBISFILE_LIBRARY} ${OGG_LIBRARY})
+TARGET_LINK_LIBRARIES(nelsnd_lowlevel nelmisc ${VORBIS_LIBRARY} ${VORBISFILE_LIBRARY})
 SET_TARGET_PROPERTIES(nelsnd_lowlevel PROPERTIES LINK_INTERFACE_LIBRARIES "")
 NL_DEFAULT_PROPS(nelsnd_lowlevel "NeL, Library: Sound Lowlevel")
 NL_ADD_STATIC_VID_DRIVERS(nelsnd_lowlevel)