Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MINGW_changes' into 'master'

Browse Source 
Mingw changes

TODO: Test 

See merge request !68
This commit is contained in:
Jan Möbius
2016-05-31 12:23:33 +02:00
parent 279659856a ec84b4750a
commit 16a6a6b607
4 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/ACGCommon.cmake
View File

@@ -619,7 +619,7 @@ function (acg_add_library _target _libtype)
if (${_libtype} STREQUAL SHAREDANDSTATIC)
set (_type SHARED)
if (NOT WIN32)
if (NOT WIN32 OR MINGW)
set (_and_static 1)
else ()
set (_and_static 0)
@@ -649,7 +649,7 @@ function (acg_add_library _target _libtype)
endif ()
endif ()
if (WIN32 OR (APPLE AND NOT ACG_PROJECT_MACOS_BUNDLE))
if ( (WIN32 AND MSVC) OR (APPLE AND NOT ACG_PROJECT_MACOS_BUNDLE))
if (${_type} STREQUAL SHARED)
add_custom_command (TARGET ${_target} POST_BUILD
COMMAND ${CMAKE_COMMAND} -E
@@ -688,7 +688,7 @@ function (acg_add_library _target _libtype)
${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_BINDIR}/$<TARGET_FILE_NAME:${_target}>)
endif ()
endif(WIN32 OR (APPLE AND NOT ACG_PROJECT_MACOS_BUNDLE))
endif( (WIN32 AND MSVC) OR (APPLE AND NOT ACG_PROJECT_MACOS_BUNDLE))
if (_and_static)
add_custom_command (TARGET ${_target}Static POST_BUILD