Get rid of WINDOWS_EXT completely as it is now no longer used
This commit is contained in:
parent
534aaf0b4d
commit
d0076e24a7
|
@ -15,11 +15,6 @@ if (NOT "${META_PROJECT_TYPE}" STREQUAL "application")
|
||||||
)
|
)
|
||||||
endif ()
|
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
|
# define relevant files
|
||||||
set(ALL_FILES
|
set(ALL_FILES
|
||||||
${HEADER_FILES}
|
${HEADER_FILES}
|
||||||
|
|
|
@ -44,11 +44,6 @@ if (MINGW AND NOT VERSIONED_MINGW_LIBRARIES)
|
||||||
set(CMAKE_SHARED_LIBRARY_PREFIX "")
|
set(CMAKE_SHARED_LIBRARY_PREFIX "")
|
||||||
endif ()
|
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
|
# set compile definitions for static build
|
||||||
if (NOT BUILD_SHARED_LIBS)
|
if (NOT BUILD_SHARED_LIBS)
|
||||||
list(APPEND META_PUBLIC_COMPILE_DEFINITIONS ${META_PROJECT_VARNAME_UPPER}_STATIC)
|
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 ()
|
||||||
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
|
# define relevant files
|
||||||
set(ALL_FILES
|
set(ALL_FILES
|
||||||
${HEADER_FILES}
|
${HEADER_FILES}
|
||||||
|
@ -173,10 +161,12 @@ else ()
|
||||||
if (META_PLUGIN_CATEGORY)
|
if (META_PLUGIN_CATEGORY)
|
||||||
set_target_properties(${META_TARGET_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${META_PLUGIN_CATEGORY}")
|
set_target_properties(${META_TARGET_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${META_PLUGIN_CATEGORY}")
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
|
# incorporate the SOVERSION into the library name for mingw-w64 targets
|
||||||
if (BUILD_SHARED_LIBS AND NOT META_IS_PLUGIN
|
if (BUILD_SHARED_LIBS AND NOT META_IS_PLUGIN
|
||||||
AND MINGW
|
AND MINGW
|
||||||
AND VERSIONED_MINGW_LIBRARIES)
|
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 ()
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue