Merge commit '1a0075a3f03af095ee32ded7f101cac79267f906' into master-merge

[xonotic/netradiant.git] / radiant / CMakeLists.txt

diff --git a/radiant/CMakeLists.txt b/radiant/CMakeLists.txt
index aa52ef32ed842f2a75f83a7b62468f7f56a5b7f9..ae33bcea7dd884f5b0babe17e55691a6b323517b 100644 (file)
--- a/radiant/CMakeLists.txt
+++ b/radiant/CMakeLists.txt
@@ -34,13 +34,14 @@ set(RADIANTLIST
     error.cpp error.h
     feedback.cpp feedback.h
     filetypes.cpp filetypes.h
+    filterbar.cpp filterbar.h
     filters.cpp filters.h
     findtexturedialog.cpp findtexturedialog.h
-    glwidget.cpp glwidget.h
     grid.cpp grid.h
     groupdialog.cpp groupdialog.h
     gtkdlgs.cpp gtkdlgs.h
     gtkmisc.cpp gtkmisc.h
+       gtktheme.cpp gtktheme.h
     help.cpp help.h
     image.cpp image.h
     main.cpp main.h
@@ -124,6 +125,7 @@ target_link_libraries(${RADIANT_BASENAME}
     splines
     stream
     string
+    transformpath
     uilib
     xmllib
 )
@@ -136,10 +138,21 @@ endif ()
 # because of a mistake in the mime-type library.
 # Because of that it was not possible to launch such executables from
 # the file browser.
+#
 # While the problem is fixed upstream, most distributions still ship
 # with a faulty mime-type library and may do for a long time.
+#
 # See: https://gitlab.freedesktop.org/xdg/shared-mime-info/-/issues/11
-if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
+#
+# It may produce such warning though at strip time:
+#   warning: allocated section `.dynstr' not in segment
+# and produce an unusable binary, better not strip when using this hack.
+#
+# This hack is only wanted for release build and
+# when NetRadiant is not installed system-wide.
+if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux"
+    AND "${CMAKE_BUILD_TYPE}" STREQUAL "Release"
+    AND NOT FHS_INSTALL)
     target_link_libraries(${RADIANT_BASENAME} -no-pie)
 endif()