DLL is no longer experimental, as it builds and executes fine on Windows
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@701 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
@@ -10,8 +10,7 @@ if ( BUILD_APPS )
|
||||
if(${PROJECT_NAME} MATCHES "OpenMesh")
|
||||
|
||||
if ( WIN32 AND OPENMESH_BUILD_SHARED )
|
||||
#!!!! Experimental Feature!!!
|
||||
add_definitions(-DOPENMESHDLL )
|
||||
add_definitions(-DOPENMESHDLL )
|
||||
endif()
|
||||
|
||||
add_subdirectory (Dualizer)
|
||||
@@ -77,22 +76,22 @@ if ( BUILD_APPS )
|
||||
endif()
|
||||
|
||||
if ( WIN32 )
|
||||
FILE(GLOB files_install_app_dlls "${CMAKE_BINARY_DIR}/Build/*.dll" )
|
||||
INSTALL(FILES ${files_install_app_dlls} DESTINATION . )
|
||||
FILE(GLOB files_install_app_dlls "${CMAKE_BINARY_DIR}/Build/*.dll" )
|
||||
INSTALL(FILES ${files_install_app_dlls} DESTINATION . )
|
||||
endif()
|
||||
|
||||
else () # QT ,Opengl or glut not found
|
||||
|
||||
if (NOT QT4_FOUND)
|
||||
message ("QT 4 not found! Skipping some apps.")
|
||||
message ("QT 4 not found! Skipping some apps.")
|
||||
endif ()
|
||||
|
||||
if (NOT OPENGL_FOUND)
|
||||
message ("OpengGL not found! Skipping some apps.")
|
||||
message ("OpengGL not found! Skipping some apps.")
|
||||
endif ()
|
||||
|
||||
if (NOT GLUT_FOUND)
|
||||
message ("GLUT not found! Skipping some apps.")
|
||||
message ("GLUT not found! Skipping some apps.")
|
||||
endif ()
|
||||
|
||||
endif ()
|
||||
|
||||
@@ -38,7 +38,6 @@ endif()
|
||||
if (WIN32)
|
||||
|
||||
if ( OPENMESH_BUILD_SHARED )
|
||||
# Experimental Feature!!!!
|
||||
add_definitions( -DOPENMESHDLL -DBUILDOPENMESHDLL)
|
||||
acg_add_library (OpenMeshCore SHARED ${sources} ${headers})
|
||||
else()
|
||||
@@ -121,13 +120,13 @@ install(DIRECTORY .
|
||||
#install Template cc files (required by headers)
|
||||
install(DIRECTORY .
|
||||
DESTINATION include/OpenMesh/Core
|
||||
FILES_MATCHING
|
||||
FILES_MATCHING
|
||||
PATTERN "*T.cc"
|
||||
PATTERN "CVS" EXCLUDE
|
||||
PATTERN ".svn" EXCLUDE
|
||||
PATTERN "CVS" EXCLUDE
|
||||
PATTERN ".svn" EXCLUDE
|
||||
PATTERN "tmp" EXCLUDE
|
||||
PATTERN "Templates" EXCLUDE
|
||||
PATTERN "Debian*" EXCLUDE)
|
||||
PATTERN "Debian*" EXCLUDE)
|
||||
|
||||
#install the config file
|
||||
install(FILES System/config.h DESTINATION include/OpenMesh/Core/System)
|
||||
@@ -138,14 +137,14 @@ install(DIRECTORY IO/
|
||||
FILES_MATCHING
|
||||
PATTERN "*.inl"
|
||||
PATTERN "CVS" EXCLUDE
|
||||
PATTERN ".svn" EXCLUDE
|
||||
PATTERN "reader" EXCLUDE
|
||||
PATTERN "writer" EXCLUDE
|
||||
PATTERN "importer" EXCLUDE
|
||||
PATTERN "exporter" EXCLUDE
|
||||
PATTERN "tmp" EXCLUDE
|
||||
PATTERN "Debian*" EXCLUDE )
|
||||
|
||||
PATTERN ".svn" EXCLUDE
|
||||
PATTERN "reader" EXCLUDE
|
||||
PATTERN "writer" EXCLUDE
|
||||
PATTERN "importer" EXCLUDE
|
||||
PATTERN "exporter" EXCLUDE
|
||||
PATTERN "tmp" EXCLUDE
|
||||
PATTERN "Debian*" EXCLUDE )
|
||||
|
||||
endif ()
|
||||
|
||||
|
||||
|
||||
@@ -38,7 +38,6 @@ endif()
|
||||
if (WIN32)
|
||||
|
||||
if ( OPENMESH_BUILD_SHARED )
|
||||
# Experimental Feature!!!!
|
||||
add_definitions( -DOPENMESHDLL -DBUILDOPENMESHDLL)
|
||||
acg_add_library (OpenMeshTools SHARED ${sources} ${headers})
|
||||
else()
|
||||
|
||||
Reference in New Issue
Block a user