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

DLL is no longer experimental, as it builds and executes fine on Windows

Browse Source 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@701 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Jan Möbius
2012-09-24 14:12:15 +00:00
parent e85363b374
commit 61eef1a1d7
5 changed files with 48 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -35,7 +35,7 @@ endif ()
if ( WIN32 ) if ( WIN32 )
if ( NOT DEFINED OPENMESH_BUILD_SHARED ) if ( NOT DEFINED OPENMESH_BUILD_SHARED )
set( OPENMESH_BUILD_SHARED false CACHE BOOL "Build as shared library? (!!!Experimental Feature!!!) " ) set( OPENMESH_BUILD_SHARED false CACHE BOOL "Build as shared library(DLL)?" )
endif() endif()
endif() endif()

1
src/OpenMesh/Apps/CMakeLists.txt
View File

@@ -10,7 +10,6 @@ if ( BUILD_APPS )
if(${PROJECT_NAME} MATCHES "OpenMesh") if(${PROJECT_NAME} MATCHES "OpenMesh")
if ( WIN32 AND OPENMESH_BUILD_SHARED ) if ( WIN32 AND OPENMESH_BUILD_SHARED )
#!!!! Experimental Feature!!!
add_definitions(-DOPENMESHDLL ) add_definitions(-DOPENMESHDLL )
endif() endif()

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

@@ -38,7 +38,6 @@ endif()
if (WIN32) if (WIN32)
if ( OPENMESH_BUILD_SHARED ) if ( OPENMESH_BUILD_SHARED )
# Experimental Feature!!!!
add_definitions( -DOPENMESHDLL -DBUILDOPENMESHDLL) add_definitions( -DOPENMESHDLL -DBUILDOPENMESHDLL)
acg_add_library (OpenMeshCore SHARED ${sources} ${headers}) acg_add_library (OpenMeshCore SHARED ${sources} ${headers})
else() else()

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

@@ -38,7 +38,6 @@ endif()
if (WIN32) if (WIN32)
if ( OPENMESH_BUILD_SHARED ) if ( OPENMESH_BUILD_SHARED )
# Experimental Feature!!!!
add_definitions( -DOPENMESHDLL -DBUILDOPENMESHDLL) add_definitions( -DOPENMESHDLL -DBUILDOPENMESHDLL)
acg_add_library (OpenMeshTools SHARED ${sources} ${headers}) acg_add_library (OpenMeshTools SHARED ${sources} ${headers})
else() else()

15
src/Unittests/CMakeLists.txt
View File

@@ -58,9 +58,22 @@ if ( OPENMESH_BUILD_UNIT_TESTS )
copy_if_different copy_if_different
${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/unittests.exe ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/unittests.exe
${CMAKE_BINARY_DIR}/Unittests/unittests.exe) ${CMAKE_BINARY_DIR}/Unittests/unittests.exe)
endif()
# If OpenMesh is build as a shared library, we need to copy the dlls to the directory for the unittests!
if ( OPENMESH_BUILD_SHARED ) if ( OPENMESH_BUILD_SHARED )
#!!!! Experimental Feature!!! #!!!! Experimental Feature!!!
add_custom_command (TARGET unittests POST_BUILD
COMMAND ${CMAKE_COMMAND} -E
copy_if_different
${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_BINDIR}/OpenMesh*.dll
${CMAKE_BINARY_DIR}/Unittests/)
message("Copy from ${CMAKE_BINARY_DIR}/Build/${ACG_PROJECT_BINDIR}/OpenMesh*.dll to ${CMAKE_BINARY_DIR}/Unittests/")
endif()
endif()
if ( OPENMESH_BUILD_SHARED )
#-------- copy dlls to unittests -------- #-------- copy dlls to unittests --------
SET(OPENMESH_TARGETS "OpenMeshTools" "OpenMeshCore") SET(OPENMESH_TARGETS "OpenMeshTools" "OpenMeshCore")