From: Thomas Debesse Date: Wed, 18 Apr 2018 18:34:00 +0000 (+0200) Subject: cmake: rename “radiant” binary to “netradiant” X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;ds=sidebyside;h=fe9f32f57672180f8d3a17c3f4b043a61791df16;p=xonotic%2Fnetradiant.git cmake: rename “radiant” binary to “netradiant” --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 7bc63919..1336f3b1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -242,7 +242,7 @@ endmacro() if (BUILD_RADIANT) add_subdirectory(radiant _radiant) - set_target_properties(radiant PROPERTIES + set_target_properties(${RADIANT_BASENAME} PROPERTIES COMPILE_DEFINITIONS RADIANT_EXECUTABLE="${RADIANT_EXECUTABLE}" ) endif () diff --git a/radiant/CMakeLists.txt b/radiant/CMakeLists.txt index 05d79830..6fcb3680 100644 --- a/radiant/CMakeLists.txt +++ b/radiant/CMakeLists.txt @@ -92,11 +92,11 @@ set(RADIANTLIST ) if (WIN32) list(APPEND RADIANTLIST multimon.cpp multimon.h) -endif() +endif () -radiant_tool(radiant WIN32 radiant.rc ${RADIANTLIST}) -add_dependencies(radiant modules) -target_link_libraries(radiant +radiant_tool(${RADIANT_BASENAME} WIN32 radiant.rc ${RADIANTLIST}) +add_dependencies(${RADIANT_BASENAME} modules) +target_link_libraries(${RADIANT_BASENAME} ${CMAKE_DL_LIBS} ${LIBXML2_LIBRARIES} ${OPENGL_gl_LIBRARY} @@ -127,7 +127,7 @@ target_link_libraries(radiant xmllib ) if (X11_LIBRARIES) - target_link_libraries(radiant ${X11_LIBRARIES}) + target_link_libraries(${RADIANT_BASENAME} ${X11_LIBRARIES}) endif () -copy_dlls(radiant) +copy_dlls(${RADIANT_BASENAME})