Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
OpenMesh
OpenMesh
Commits
b2f3d5ea
Commit
b2f3d5ea
authored
May 30, 2016
by
Jan Möbius
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Several changes to make Mingw happy
parent
a564a30c
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
cmake/ACGCommon.cmake
cmake/ACGCommon.cmake
+3
-3
src/OpenMesh/Core/CMakeLists.txt
src/OpenMesh/Core/CMakeLists.txt
+1
-1
src/OpenMesh/Tools/CMakeLists.txt
src/OpenMesh/Tools/CMakeLists.txt
+2
-2
No files found.
cmake/ACGCommon.cmake
View file @
b2f3d5ea
...
...
@@ -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
...
...
src/OpenMesh/Core/CMakeLists.txt
View file @
b2f3d5ea
...
...
@@ -35,7 +35,7 @@ if ( NOT ${PROJECT_NAME} MATCHES "OpenMesh")
endif
()
if
(
WIN32
)
if
(
WIN32
AND NOT MINGW
)
if
(
OPENMESH_BUILD_SHARED
)
add_definitions
(
-DOPENMESHDLL -DBUILDOPENMESHDLL
)
...
...
src/OpenMesh/Tools/CMakeLists.txt
View file @
b2f3d5ea
...
...
@@ -25,9 +25,9 @@ acg_append_files (sources "*.cc" ${directories})
#Drop the template only cc files
acg_drop_templates
(
sources
)
IF
(
WIN32
)
IF
(
WIN32
AND NOT MINGW
)
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!
if
(
NOT
${
PROJECT_NAME
}
MATCHES
"OpenMesh"
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment