Fixed: Compilation under Linux with STLport

14 years ago · 56dc241c3d
parent 51c4c01968
commit 56dc241c3d
22 changed files with 5 additions and 89 deletions
--- a/code/CMakeModules/nel.cmake
+++ b/code/CMakeModules/nel.cmake
@ -74,7 +74,7 @@ MACRO(NL_ADD_RUNTIME_FLAGS name)
 #      LINK_FLAGS_RELEASE "${CMAKE_LINK_FLAGS_RELEASE}")
  ENDIF(WIN32)
  IF(WITH_STLPORT)
-    TARGET_LINK_LIBRARIES(${name} ${STLPORT_LIBRARIES})
+    TARGET_LINK_LIBRARIES(${name} ${STLPORT_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
  ENDIF(WITH_STLPORT)
 ENDMACRO(NL_ADD_RUNTIME_FLAGS)

@ -182,7 +182,7 @@ MACRO(NL_SETUP_DEFAULT_OPTIONS)
  ELSE(WIN32 AND MFC_FOUND)
    OPTION(WITH_MFC               "With MFC Support"                              OFF)
  ENDIF(WIN32 AND MFC_FOUND)
-  
+
  ###
  # Optional support
  ###
@ -191,7 +191,7 @@ MACRO(NL_SETUP_DEFAULT_OPTIONS)
  ELSE(WIN32)
    OPTION(WITH_STLPORT           "With STLport support."                         OFF)
  ENDIF(WIN32)
-  
+
  OPTION(BUILD_DASHBOARD          "Build to the CDash dashboard"                  OFF)

  OPTION(WITH_NEL	              "Build NeL (nearly always required)."           ON )
@ -345,7 +345,7 @@ MACRO(NL_SETUP_BUILD_FLAGS)

  SET(CMAKE_C_FLAGS ${PLATFORM_CFLAGS} CACHE STRING "" FORCE)
  SET(CMAKE_CXX_FLAGS ${PLATFORM_CXXFLAGS} CACHE STRING "" FORCE)
-  
+
  ## Debug
  SET(CMAKE_C_FLAGS_DEBUG ${NL_DEBUG_CFLAGS} CACHE STRING "" FORCE)
  SET(CMAKE_CXX_FLAGS_DEBUG ${NL_DEBUG_CFLAGS} CACHE STRING "" FORCE)
@ -415,7 +415,7 @@ MACRO(NL_SETUP_PREFIX_PATHS)
      SET(NL_DRIVER_PREFIX "${CMAKE_INSTALL_PREFIX}/lib/nel" CACHE PATH "Installation path for drivers.")
    ENDIF(WIN32)
  ENDIF(NOT NL_DRIVER_PREFIX)
-  
+
 ENDMACRO(NL_SETUP_PREFIX_PATHS)

 MACRO(RYZOM_SETUP_PREFIX_PATHS)
--- a/code/nel/samples/misc/command/CMakeLists.txt
+++ b/code/nel/samples/misc/command/CMakeLists.txt
@ -2,10 +2,6 @@ FILE(GLOB SRC *.cpp)

 ADD_EXECUTABLE(nl_sample_command ${SRC})

-IF(WITH_STLPORT)
-  TARGET_LINK_LIBRARIES(nl_sample_command ${CMAKE_THREAD_LIBS_INIT})
-ENDIF(WITH_STLPORT)
-
 TARGET_LINK_LIBRARIES(nl_sample_command nelmisc)
 NL_DEFAULT_PROPS(nl_sample_command "NeL, Samples, Misc: Commands")
 NL_ADD_RUNTIME_FLAGS(nl_sample_command)
--- a/code/nel/src/3d/CMakeLists.txt
+++ b/code/nel/src/3d/CMakeLists.txt
@ -691,10 +691,6 @@ NL_TARGET_LIB(nel3d ${HEADERS} ${SRC})

 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIRS})

-IF(WITH_STLPORT)
-  TARGET_LINK_LIBRARIES(nel3d ${CMAKE_THREAD_LIBS_INIT})
-ENDIF(WITH_STLPORT)
-
 TARGET_LINK_LIBRARIES(nel3d nelmisc ${FREETYPE_LIBRARY})
 SET_TARGET_PROPERTIES(nel3d PROPERTIES LINK_INTERFACE_LIBRARIES "")
 NL_DEFAULT_PROPS(nel3d "NeL, Library: NeL 3D")
--- a/code/nel/src/3d/driver/opengl/CMakeLists.txt
+++ b/code/nel/src/3d/driver/opengl/CMakeLists.txt
@ -16,10 +16,6 @@ NL_TARGET_DRIVER(${NLDRV_OGL_LIB} ${SRC})

 INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR})

-IF(WITH_STLPORT)
-  TARGET_LINK_LIBRARIES(${NLDRV_OGL_LIB} ${CMAKE_THREAD_LIBS_INIT})
-ENDIF(WITH_STLPORT)
-
 TARGET_LINK_LIBRARIES(${NLDRV_OGL_LIB} nel3d nelmisc ${OPENGL_gl_LIBRARY})
 NL_DEFAULT_PROPS(${NLDRV_OGL_LIB} "NeL, Driver, Video: OpenGL")
 NL_ADD_LIB_SUFFIX(${NLDRV_OGL_LIB})
--- a/code/nel/src/georges/CMakeLists.txt
+++ b/code/nel/src/georges/CMakeLists.txt
@ -7,10 +7,6 @@ NL_TARGET_LIB(nelgeorges ${HEADERS} ${SRC})

 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})

-IF(WITH_STLPORT)
-  TARGET_LINK_LIBRARIES(nelgeorges ${CMAKE_THREAD_LIBS_INIT})
-ENDIF(WITH_STLPORT)
-
 TARGET_LINK_LIBRARIES(nelgeorges ${LIBXML2_LIBRARIES} nelmisc)
 SET_TARGET_PROPERTIES(nelgeorges PROPERTIES LINK_INTERFACE_LIBRARIES "")
 NL_DEFAULT_PROPS(nelgeorges "NeL, Library: NeL Georges")
--- a/code/nel/src/ligo/CMakeLists.txt
+++ b/code/nel/src/ligo/CMakeLists.txt
@ -5,10 +5,6 @@ NL_TARGET_LIB(nelligo ${HEADERS} ${SRC})

 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})

-IF(WITH_STLPORT)
-  TARGET_LINK_LIBRARIES(nelligo ${CMAKE_THREAD_LIBS_INIT})
-ENDIF(WITH_STLPORT)
-
 TARGET_LINK_LIBRARIES(nelligo ${LIBXML2_LIBRARIES} nelmisc)
 SET_TARGET_PROPERTIES(nelligo PROPERTIES LINK_INTERFACE_LIBRARIES "")
 NL_DEFAULT_PROPS(nelligo "NeL, Library: NeL Ligo")
--- a/code/nel/src/logic/CMakeLists.txt
+++ b/code/nel/src/logic/CMakeLists.txt
@ -5,10 +5,6 @@ NL_TARGET_LIB(nellogic ${HEADERS} ${SRC})

 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})

-IF(WITH_STLPORT)
-  TARGET_LINK_LIBRARIES(nellogic ${CMAKE_THREAD_LIBS_INIT})
-ENDIF(WITH_STLPORT)
-
 TARGET_LINK_LIBRARIES(nellogic ${LIBXML2_LIBRARIES} nelmisc nelnet)
 SET_TARGET_PROPERTIES(nellogic PROPERTIES LINK_INTERFACE_LIBRARIES "")
 NL_DEFAULT_PROPS(nellogic "NeL, Library: NeL Logic")
--- a/code/nel/src/net/CMakeLists.txt
+++ b/code/nel/src/net/CMakeLists.txt
@ -12,10 +12,6 @@ IF(WITH_GTK)
  ENDIF(GTK2_FOUND)
 ENDIF(WITH_GTK)

-IF(WITH_STLPORT)
-  TARGET_LINK_LIBRARIES(nelnet ${CMAKE_THREAD_LIBS_INIT})
-ENDIF(WITH_STLPORT)
-
 TARGET_LINK_LIBRARIES(nelnet nelmisc)
 SET_TARGET_PROPERTIES(nelnet PROPERTIES LINK_INTERFACE_LIBRARIES "")
 NL_DEFAULT_PROPS(nelnet "NeL, Library: NeL Net")
--- a/code/nel/src/pacs/CMakeLists.txt
+++ b/code/nel/src/pacs/CMakeLists.txt
@ -5,10 +5,6 @@ NL_TARGET_LIB(nelpacs ${HEADERS} ${SRC})

 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})

-IF(WITH_STLPORT)
-  TARGET_LINK_LIBRARIES(nelpacs ${CMAKE_THREAD_LIBS_INIT})
-ENDIF(WITH_STLPORT)
-
 TARGET_LINK_LIBRARIES(nelpacs nelmisc)
 SET_TARGET_PROPERTIES(nelpacs PROPERTIES LINK_INTERFACE_LIBRARIES "")
 NL_DEFAULT_PROPS(nelpacs "NeL, Library: NeL PACS")
--- a/code/nel/src/sound/CMakeLists.txt
+++ b/code/nel/src/sound/CMakeLists.txt
@ -5,10 +5,6 @@ NL_TARGET_LIB(nelsound ${HEADERS} ${SRC})

 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})

-IF(WITH_STLPORT)
-  TARGET_LINK_LIBRARIES(nelsound ${CMAKE_THREAD_LIBS_INIT})
-ENDIF(WITH_STLPORT)
-
 TARGET_LINK_LIBRARIES(nelsound ${LIBXML2_LIBRARIES} nelmisc nelligo nelgeorges nel3d nelsnd_lowlevel)
 SET_TARGET_PROPERTIES(nelsound PROPERTIES LINK_INTERFACE_LIBRARIES "")
 NL_DEFAULT_PROPS(nelsound "NeL, Library: NeL Sound")
--- a/code/nel/src/sound/driver/CMakeLists.txt
+++ b/code/nel/src/sound/driver/CMakeLists.txt
@ -12,10 +12,6 @@ IF(WITH_STATIC)
  TARGET_LINK_LIBRARIES(nelsnd_lowlevel ${OGG_LIBRARY})
 ENDIF(WITH_STATIC)

-IF(WITH_STLPORT)
-  TARGET_LINK_LIBRARIES(nelsnd_lowlevel ${CMAKE_THREAD_LIBS_INIT})
-ENDIF(WITH_STLPORT)
-
 SET_TARGET_PROPERTIES(nelsnd_lowlevel PROPERTIES LINK_INTERFACE_LIBRARIES "")
 NL_DEFAULT_PROPS(nelsnd_lowlevel "NeL, Library: Sound Lowlevel")
 NL_ADD_RUNTIME_FLAGS(nelsnd_lowlevel)
--- a/code/nel/src/sound/driver/openal/CMakeLists.txt
+++ b/code/nel/src/sound/driver/openal/CMakeLists.txt
@ -28,10 +28,6 @@ NL_TARGET_DRIVER(${NLDRV_AL_LIB} ${SRC})

 INCLUDE_DIRECTORIES(${OPENAL_INCLUDE_DIR})

-IF(WITH_STLPORT)
-  TARGET_LINK_LIBRARIES(${NLDRV_AL_LIB} ${CMAKE_THREAD_LIBS_INIT})
-ENDIF(WITH_STLPORT)
-
 TARGET_LINK_LIBRARIES(${NLDRV_AL_LIB} ${OPENAL_LIBRARY} nelmisc nelsnd_lowlevel)
 NL_DEFAULT_PROPS(${NLDRV_AL_LIB} "NeL, Driver, Sound: OpenAL")
 NL_ADD_RUNTIME_FLAGS(${NLDRV_AL_LIB})
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/core/CMakeLists.txt
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/core/CMakeLists.txt
@ -39,10 +39,6 @@ ADD_LIBRARY(ovqt_plugin_core MODULE ${SRC} ${OVQT_CORE_PLUGIN_MOC_SRC} ${OVQT_EX

 TARGET_LINK_LIBRARIES(ovqt_plugin_core nelmisc nel3d ${QT_LIBRARIES})

-IF(WITH_STLPORT)
-  TARGET_LINK_LIBRARIES(ovqt_plugin_core ${CMAKE_THREAD_LIBS_INIT})
-ENDIF(WITH_STLPORT)
-
 NL_DEFAULT_PROPS(ovqt_plugin_core "NeL, Tools, 3D: Object Viewer Qt Plugin: Core")
 NL_ADD_RUNTIME_FLAGS(ovqt_plugin_core)
 NL_ADD_LIB_SUFFIX(ovqt_plugin_core)
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/example/CMakeLists.txt
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/example/CMakeLists.txt
@ -31,10 +31,6 @@ ADD_LIBRARY(ovqt_plugin_example MODULE ${SRC} ${OVQT_PLUG_EXAMPLE_MOC_SRC} ${OVQ

 TARGET_LINK_LIBRARIES(ovqt_plugin_example nelmisc ${QT_LIBRARIES})

-IF(WITH_STLPORT)
-  TARGET_LINK_LIBRARIES(ovqt_plugin_example ${CMAKE_THREAD_LIBS_INIT})
-ENDIF(WITH_STLPORT)
-
 NL_DEFAULT_PROPS(ovqt_plugin_example "NeL, Tools, 3D: Object Viewer Qt Plugin: Example")
 NL_ADD_RUNTIME_FLAGS(ovqt_plugin_example)
 NL_ADD_LIB_SUFFIX(ovqt_plugin_example)
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/log/CMakeLists.txt
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/log/CMakeLists.txt
@ -27,10 +27,6 @@ ADD_LIBRARY(ovqt_plugin_log MODULE ${SRC} ${OVQT_PLUG_LOG_MOC_SRC} ${OVQT_EXT_SY

 TARGET_LINK_LIBRARIES(ovqt_plugin_log nelmisc ${QT_LIBRARIES})

-IF(WITH_STLPORT)
-  TARGET_LINK_LIBRARIES(ovqt_plugin_log ${CMAKE_THREAD_LIBS_INIT})
-ENDIF(WITH_STLPORT)
-
 NL_DEFAULT_PROPS(ovqt_plugin_log "NeL, Tools, 3D: Object Viewer Qt Plugin: Log")
 NL_ADD_RUNTIME_FLAGS(ovqt_plugin_log)
 NL_ADD_LIB_SUFFIX(ovqt_plugin_log)
--- a/code/nel/tools/3d/object_viewer_qt/src/plugins/ovqt_sheet_builder/CMakeLists.txt
+++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/ovqt_sheet_builder/CMakeLists.txt
@ -23,10 +23,6 @@ ADD_LIBRARY(ovqt_plugin_sheet_builder MODULE ${SRC} ${OVQT_PLUG_SHEET_BUILDER_MO

 TARGET_LINK_LIBRARIES(ovqt_plugin_sheet_builder nelmisc ${QT_LIBRARIES})

-IF(WITH_STLPORT)
-  TARGET_LINK_LIBRARIES(ovqt_plugin_sheet_builder ${CMAKE_THREAD_LIBS_INIT})
-ENDIF(WITH_STLPORT)
-		
 NL_DEFAULT_PROPS(ovqt_plugin_sheet_builder "NeL, Tools, 3D: Object Viewer Qt Plugin: Sheet builder")
 NL_ADD_RUNTIME_FLAGS(ovqt_plugin_sheet_builder)
 NL_ADD_LIB_SUFFIX(ovqt_plugin_sheet_builder)
--- a/code/nel/tools/3d/object_viewer_widget/src/CMakeLists.txt
+++ b/code/nel/tools/3d/object_viewer_widget/src/CMakeLists.txt
@ -27,10 +27,6 @@ TARGET_LINK_LIBRARIES(object_viewer_widget_qt
 		${QT_LIBRARIES}
 		${QT_QTOPENGL_LIBRARY})

-IF(WITH_STLPORT)
-  TARGET_LINK_LIBRARIES(object_viewer_widget_qt ${CMAKE_THREAD_LIBS_INIT})
-ENDIF(WITH_STLPORT)
-
 ADD_DEFINITIONS(-DQT_NO_KEYWORDS ${LIBXML2_DEFINITIONS} ${QT_DEFINITIONS})
 ADD_DEFINITIONS(-DQT_PLUGIN)
 ADD_DEFINITIONS(-DQT_SHARED)
--- a/code/ryzom/common/src/game_share/CMakeLists.txt
+++ b/code/ryzom/common/src/game_share/CMakeLists.txt
@ -11,10 +11,6 @@ NL_TARGET_LIB(ryzom_gameshare ${PRIV_H} ${SRC})

 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${NEL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})

-IF(WITH_STLPORT)
-  TARGET_LINK_LIBRARIES(ryzom_gameshare ${CMAKE_THREAD_LIBS_INIT})
-ENDIF(WITH_STLPORT)
-
 TARGET_LINK_LIBRARIES(ryzom_gameshare nelmisc nelnet nelligo nelgeorges ${LIBXML2_LIBRARIES} ${ZLIB_LIBRARIES})
 NL_DEFAULT_PROPS(ryzom_gameshare "Ryzom, Library: Game Share")
 NL_ADD_RUNTIME_FLAGS(ryzom_gameshare)
--- a/code/ryzom/server/src/admin_modules/CMakeLists.txt
+++ b/code/ryzom/server/src/admin_modules/CMakeLists.txt
@ -4,10 +4,6 @@ NL_TARGET_LIB(ryzom_adminmodules ${SRC})

 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR})

-IF(WITH_STLPORT)
-  TARGET_LINK_LIBRARIES(ryzom_adminmodules ${CMAKE_THREAD_LIBS_INIT})
-ENDIF(WITH_STLPORT)
-
 TARGET_LINK_LIBRARIES(ryzom_adminmodules nelmisc nelnet)
 NL_DEFAULT_PROPS(ryzom_adminmodules "Ryzom, Library: Service Admin Modules")
 NL_ADD_RUNTIME_FLAGS(ryzom_adminmodules)
--- a/code/ryzom/server/src/gameplay_module_lib/CMakeLists.txt
+++ b/code/ryzom/server/src/gameplay_module_lib/CMakeLists.txt
@ -4,10 +4,6 @@ NL_TARGET_LIB(ryzom_gameplaymodule ${SRC})

 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})

-IF(WITH_STLPORT)
-  TARGET_LINK_LIBRARIES(ryzom_gameplaymodule ${CMAKE_THREAD_LIBS_INIT})
-ENDIF(WITH_STLPORT)
-
 TARGET_LINK_LIBRARIES(ryzom_gameplaymodule nelmisc)
 NL_DEFAULT_PROPS(ryzom_gameplaymodule "Ryzom, Library: Gameplay Module")
 NL_ADD_RUNTIME_FLAGS(ryzom_gameplaymodule)
--- a/code/ryzom/tools/leveldesign/export/CMakeLists.txt
+++ b/code/ryzom/tools/leveldesign/export/CMakeLists.txt
@ -5,10 +5,6 @@ NL_TARGET_LIB(ryzom_export ${PRIV_H} ${SRC})

 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})

-IF(WITH_STLPORT)
-  TARGET_LINK_LIBRARIES(ryzom_export ${CMAKE_THREAD_LIBS_INIT})
-ENDIF(WITH_STLPORT)
-
 TARGET_LINK_LIBRARIES(ryzom_export nelmisc nelligo nelgeorges nel3d nelpacs ${LIBXML2_LIBRARIES} ${ZLIB_LIBRARIES})
 NL_DEFAULT_PROPS(ryzom_export "Ryzom, Library, World: Export Tools")
 NL_ADD_RUNTIME_FLAGS(ryzom_export)
--- a/code/ryzom/tools/leveldesign/world_editor/land_export_lib/CMakeLists.txt
+++ b/code/ryzom/tools/leveldesign/world_editor/land_export_lib/CMakeLists.txt
@ -5,10 +5,6 @@ NL_TARGET_LIB(ryzom_landexport ${PRIV_H} ${SRC})

 INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR})

-IF(WITH_STLPORT)
-  TARGET_LINK_LIBRARIES(ryzom_landexport ${CMAKE_THREAD_LIBS_INIT})
-ENDIF(WITH_STLPORT)
-
 TARGET_LINK_LIBRARIES(ryzom_landexport ryzom_export nelmisc nelligo nelgeorges nel3d nelpacs ${LIBXML2_LIBRARIES} ${ZLIB_LIBRARIES})
 NL_DEFAULT_PROPS(ryzom_landexport "Ryzom, Library, World: Land Export")
 NL_ADD_RUNTIME_FLAGS(ryzom_landexport)