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

1
Doc/changelog.docu
View File

@@ -29,6 +29,7 @@
<b>Build System</b> <b>Build System</b>
<ul> <ul>
<li>Some fixes for min gw (Thanks to Xan for the patch)</li> <li>Some fixes for min gw (Thanks to Xan for the patch)</li>
<li>Several changes to support mingw on windows again. (Thanks to Christian Feurer for the patches).</li>
</ul> </ul>
<b>Infrastructure</b> <b>Infrastructure</b>

6
cmake/ACGCommon.cmake
View File

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

2
src/OpenMesh/Core/CMakeLists.txt
View File

@@ -35,7 +35,7 @@ if ( NOT ${PROJECT_NAME} MATCHES "OpenMesh")
endif() endif()
if (WIN32) if (WIN32 AND NOT MINGW)
if ( OPENMESH_BUILD_SHARED ) if ( OPENMESH_BUILD_SHARED )
add_definitions( -DOPENMESHDLL -DBUILDOPENMESHDLL) add_definitions( -DOPENMESHDLL -DBUILDOPENMESHDLL)

4
src/OpenMesh/Tools/CMakeLists.txt
View File

@@ -25,9 +25,9 @@ acg_append_files (sources "*.cc" ${directories})
#Drop the template only cc files #Drop the template only cc files
acg_drop_templates(sources) acg_drop_templates(sources)
IF(WIN32) IF(WIN32 AND NOT MINGW)
acg_append_files (sources "*.c" ${directories}) acg_append_files (sources "*.c" ${directories})
ENDIF(WIN32) ENDIF(WIN32 AND NOT MINGW)
# Disable Library installation when not building OpenMesh on its own but as part of another project! # Disable Library installation when not building OpenMesh on its own but as part of another project!
if ( NOT ${PROJECT_NAME} MATCHES "OpenMesh") if ( NOT ${PROJECT_NAME} MATCHES "OpenMesh")