Merge branch 'refs/heads/core4' into feature/add-target-component-alias

zerotacg · Jul 5, 2024 · b3ff259 · b3ff259
2 parents 3d78d47 + 840e0e1
commit b3ff259
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/nel/src/3d/driver/direct3d/CMakeLists.txt b/nel/src/3d/driver/direct3d/CMakeLists.txt
@@ -16,7 +16,7 @@ IF(WITH_PCH)
   target_precompile_headers(nel_drv_direct3d_win PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/stddirect3d.h)
 ENDIF()
 
-IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC_DRIVERS) OR NOT WITH_STATIC_DRIVERS)
+IF(WITH_INSTALL_LIBRARIES OR NOT WITH_STATIC_DRIVERS)
   INSTALL(TARGETS nel_drv_direct3d_win LIBRARY DESTINATION ${NL_DRIVER_PREFIX} ARCHIVE DESTINATION ${NL_LIB_PREFIX} RUNTIME DESTINATION ${NL_DRIVER_PREFIX} COMPONENT drivers3d)
   IF(WITH_MAXPLUGIN)
     INSTALL(TARGETS nel_drv_direct3d_win RUNTIME DESTINATION maxplugin COMPONENT drivers3d)

diff --git a/nel/src/3d/driver/opengl/CMakeLists.txt b/nel/src/3d/driver/opengl/CMakeLists.txt
@@ -95,7 +95,7 @@ IF(WITH_PCH)
   target_precompile_headers(${NLDRV_OGL_LIB} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/stdopengl.h)
 ENDIF()
 
-IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC_DRIVERS) OR NOT WITH_STATIC_DRIVERS)
+IF(WITH_INSTALL_LIBRARIES OR NOT WITH_STATIC_DRIVERS)
   INSTALL(TARGETS ${NLDRV_OGL_LIB} LIBRARY DESTINATION ${NL_DRIVER_PREFIX} ARCHIVE DESTINATION ${NL_LIB_PREFIX} RUNTIME DESTINATION ${NL_DRIVER_PREFIX} COMPONENT drivers3d)
   IF(WITH_MAXPLUGIN)
     INSTALL(TARGETS ${NLDRV_OGL_LIB} RUNTIME DESTINATION maxplugin COMPONENT drivers3d)

diff --git a/nel/src/3d/driver/opengles/CMakeLists.txt b/nel/src/3d/driver/opengles/CMakeLists.txt
@@ -74,7 +74,7 @@ IF(WITH_PCH)
   target_precompile_headers(${NLDRV_OGLES_LIB} PRIVATE ${SOURCE_DIR}/stdopengl.hp)
 ENDIF()
 
-IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC_DRIVERS) OR NOT WITH_STATIC_DRIVERS)
+IF(WITH_INSTALL_LIBRARIES OR NOT WITH_STATIC_DRIVERS)
   INSTALL(TARGETS ${NLDRV_OGLES_LIB} LIBRARY DESTINATION ${NL_DRIVER_PREFIX} ARCHIVE DESTINATION ${NL_LIB_PREFIX} RUNTIME DESTINATION ${NL_DRIVER_PREFIX} COMPONENT drivers3d)
   IF(WITH_MAXPLUGIN)
     INSTALL(TARGETS ${NLDRV_OGLES_LIB} RUNTIME DESTINATION maxplugin COMPONENT drivers3d)

diff --git a/nel/src/sound/driver/dsound/CMakeLists.txt b/nel/src/sound/driver/dsound/CMakeLists.txt
@@ -13,7 +13,7 @@ IF(WITH_PCH)
   target_precompile_headers(nel_drv_dsound_win PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/stddsound.h)
 ENDIF()
 
-IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC_DRIVERS) OR NOT WITH_STATIC_DRIVERS)
+IF(WITH_INSTALL_LIBRARIES OR NOT WITH_STATIC_DRIVERS)
   INSTALL(TARGETS nel_drv_dsound_win RUNTIME DESTINATION ${NL_DRIVER_PREFIX} LIBRARY DESTINATION ${NL_DRIVER_PREFIX} ARCHIVE DESTINATION ${NL_LIB_PREFIX} COMPONENT driverssound)
   IF(WITH_MAXPLUGIN)
     INSTALL(TARGETS nel_drv_dsound_win RUNTIME DESTINATION maxplugin COMPONENT driverssound)

diff --git a/nel/src/sound/driver/fmod/CMakeLists.txt b/nel/src/sound/driver/fmod/CMakeLists.txt
@@ -13,7 +13,7 @@ IF(WITH_PCH)
   target_precompile_headers(nel_drv_fmod_win PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/stdfmod.h)
 ENDIF()
 
-IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC_DRIVERS) OR NOT WITH_STATIC_DRIVERS)
+IF(WITH_INSTALL_LIBRARIES OR NOT WITH_STATIC_DRIVERS)
   INSTALL(TARGETS nel_drv_fmod_win RUNTIME DESTINATION ${NL_DRIVER_PREFIX} LIBRARY DESTINATION ${NL_DRIVER_PREFIX} ARCHIVE DESTINATION ${NL_LIB_PREFIX} COMPONENT driverssound)
   IF(WITH_MAXPLUGIN)
     INSTALL(TARGETS nel_drv_fmod_win RUNTIME DESTINATION maxplugin COMPONENT driverssound)

diff --git a/nel/src/sound/driver/openal/CMakeLists.txt b/nel/src/sound/driver/openal/CMakeLists.txt
@@ -55,7 +55,7 @@ IF(WITH_PCH)
   target_precompile_headers(${NLDRV_AL_LIB} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/stdopenal.h)
 ENDIF()
 
-IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC_DRIVERS) OR NOT WITH_STATIC_DRIVERS)
+IF(WITH_INSTALL_LIBRARIES OR NOT WITH_STATIC_DRIVERS)
   INSTALL(TARGETS ${NLDRV_AL_LIB} RUNTIME DESTINATION ${NL_DRIVER_PREFIX} LIBRARY DESTINATION ${NL_DRIVER_PREFIX} ARCHIVE DESTINATION ${NL_LIB_PREFIX} COMPONENT driverssound)
   IF(WITH_MAXPLUGIN)
     INSTALL(TARGETS ${NLDRV_AL_LIB} RUNTIME DESTINATION maxplugin COMPONENT driverssound)

diff --git a/nel/src/sound/driver/xaudio2/CMakeLists.txt b/nel/src/sound/driver/xaudio2/CMakeLists.txt
@@ -40,7 +40,7 @@ IF(WITH_PCH)
   target_precompile_headers(nel_drv_xaudio2_win PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/stdxaudio2.h)
 ENDIF()
 
-IF((WITH_INSTALL_LIBRARIES AND WITH_STATIC_DRIVERS) OR NOT WITH_STATIC_DRIVERS)
+IF(WITH_INSTALL_LIBRARIES OR NOT WITH_STATIC_DRIVERS)
   INSTALL(TARGETS nel_drv_xaudio2_win RUNTIME DESTINATION ${NL_DRIVER_PREFIX} LIBRARY DESTINATION ${NL_DRIVER_PREFIX} ARCHIVE DESTINATION ${NL_LIB_PREFIX} COMPONENT driverssound)
   IF(WITH_MAXPLUGIN)
     INSTALL(TARGETS nel_drv_xaudio2_win RUNTIME DESTINATION maxplugin COMPONENT driverssound)