Martchus
/
cpp-utilities
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Get rid of WINDOWS_EXT completely as it is now no longer used

This commit is contained in:
Martchus 2020-07-04 15:21:55 +02:00
parent 534aaf0b4d
commit d0076e24a7
2 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmake/modules/AppTarget.cmake
View File

@ -15,11 +15,6 @@ if (NOT "${META_PROJECT_TYPE}" STREQUAL "application")
)
endif ()
# set the windows extension to "exe", this is required by the mingw-w64-specific WindowsResources module
if (MINGW)
set(WINDOWS_EXT ".exe")
endif ()
# define relevant files
set(ALL_FILES
${HEADER_FILES}

16
cmake/modules/LibraryTarget.cmake
View File

@ -44,11 +44,6 @@ if (MINGW AND NOT VERSIONED_MINGW_LIBRARIES)
set(CMAKE_SHARED_LIBRARY_PREFIX "")
endif ()
# set the Windows library suffix, this is also required by the mingw-w64 specific WindowsResources module as well
if (MINGW)
set(WINDOWS_EXT ".dll")
endif ()
# set compile definitions for static build
if (NOT BUILD_SHARED_LIBS)
list(APPEND META_PUBLIC_COMPILE_DEFINITIONS ${META_PROJECT_VARNAME_UPPER}_STATIC)
@ -82,13 +77,6 @@ if (NOT META_SOVERSION AND NOT META_IS_PLUGIN)
endif ()
endif ()
# incorporate the SOVERSION into the library name for mingw-w64 targets
if (BUILD_SHARED_LIBS AND NOT META_IS_PLUGIN
AND MINGW
AND VERSIONED_MINGW_LIBRARIES)
set(WINDOWS_EXT "-${META_SOVERSION}${WINDOWS_EXT}")
endif ()
# define relevant files
set(ALL_FILES
${HEADER_FILES}
@ -173,10 +161,12 @@ else ()
if (META_PLUGIN_CATEGORY)
set_target_properties(${META_TARGET_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${META_PLUGIN_CATEGORY}")
endif ()
# incorporate the SOVERSION into the library name for mingw-w64 targets
if (BUILD_SHARED_LIBS AND NOT META_IS_PLUGIN
AND MINGW
AND VERSIONED_MINGW_LIBRARIES)
set_target_properties(${META_TARGET_NAME} PROPERTIES SUFFIX "${WINDOWS_EXT}")
set_target_properties(${META_TARGET_NAME} PROPERTIES SUFFIX "-${META_SOVERSION}.dll")
endif ()
endif ()