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

Replace remaining PROJECT_NAMES with CMAKE_PROJECT_NAMES

Browse Source
This commit is contained in:
Jan Möbius
2021-01-20 16:27:55 +01:00
parent cba826106d
commit 2504cac566
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,7 @@ endif()
if ( BUILD_APPS ) if ( BUILD_APPS )
# Only build and fixbundle apps, when we are building OpenMesh standalone # Only build and fixbundle apps, when we are building OpenMesh standalone
if(${PROJECT_NAME} MATCHES "OpenMesh") if(${CMAKE_PROJECT_NAME} MATCHES "OpenMesh")
if ( WIN32 AND OPENMESH_BUILD_SHARED ) if ( WIN32 AND OPENMESH_BUILD_SHARED )
add_definitions(-DOPENMESHDLL ) add_definitions(-DOPENMESHDLL )

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

@@ -25,7 +25,7 @@ vci_append_files (headers "*.hh" ${directories})
vci_append_files (sources "*.cc" ${directories}) vci_append_files (sources "*.cc" ${directories})
# 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 ${CMAKE_PROJECT_NAME} MATCHES "OpenMesh")
set(VCI_NO_LIBRARY_INSTALL true) set(VCI_NO_LIBRARY_INSTALL true)
endif() endif()
@@ -48,7 +48,7 @@ else ()
endif () endif ()
# Add core as dependency before fixbundle # Add core as dependency before fixbundle
if ( (${PROJECT_NAME} MATCHES "OpenMesh") AND BUILD_APPS ) if ( (${CMAKE_PROJECT_NAME} MATCHES "OpenMesh") AND BUILD_APPS )
if ( WIN32 ) if ( WIN32 )
if ( NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles" ) if ( NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles" )
@@ -65,7 +65,7 @@ if ( (${PROJECT_NAME} MATCHES "OpenMesh") AND BUILD_APPS )
endif() endif()
# if we build debug and release in the same dir, we want to install both! # if we build debug and release in the same dir, we want to install both!
if ( ${PROJECT_NAME} MATCHES "OpenMesh") if ( ${CMAKE_PROJECT_NAME} MATCHES "OpenMesh")
if ( WIN32 ) if ( WIN32 )
FILE(GLOB files_install_libs "${CMAKE_BINARY_DIR}/Build/lib/*.lib" ) FILE(GLOB files_install_libs "${CMAKE_BINARY_DIR}/Build/lib/*.lib" )
FILE(GLOB files_install_dlls "${CMAKE_BINARY_DIR}/Build/*.dll" ) FILE(GLOB files_install_dlls "${CMAKE_BINARY_DIR}/Build/*.dll" )
@@ -101,7 +101,7 @@ endif()
# Only install if the project name matches OpenMesh. # Only install if the project name matches OpenMesh.
if (NOT APPLE AND ${PROJECT_NAME} MATCHES "OpenMesh") if (NOT APPLE AND ${CMAKE_PROJECT_NAME} MATCHES "OpenMesh")
# Install Header Files) # Install Header Files)
install(DIRECTORY . install(DIRECTORY .

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

@@ -27,7 +27,7 @@ IF(WIN32 AND NOT MINGW)
ENDIF(WIN32 AND NOT MINGW) 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 ${CMAKE_PROJECT_NAME} MATCHES "OpenMesh")
set(VCI_NO_LIBRARY_INSTALL true) set(VCI_NO_LIBRARY_INSTALL true)
endif() endif()
@@ -54,7 +54,7 @@ IF( NOT WIN32 )
target_link_libraries (OpenMeshToolsStatic OpenMeshCoreStatic) target_link_libraries (OpenMeshToolsStatic OpenMeshCoreStatic)
ENDIF(NOT WIN32) ENDIF(NOT WIN32)
if ( (${PROJECT_NAME} MATCHES "OpenMesh") AND BUILD_APPS ) if ( (${CMAKE_PROJECT_NAME} MATCHES "OpenMesh") AND BUILD_APPS )
if ( WIN32 ) if ( WIN32 )
if ( NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles" ) if ( NOT "${CMAKE_GENERATOR}" MATCHES "MinGW Makefiles" )
@@ -97,7 +97,7 @@ endif()
# Only install if the project name matches OpenMesh. # Only install if the project name matches OpenMesh.
if (NOT APPLE AND ${PROJECT_NAME} MATCHES "OpenMesh") if (NOT APPLE AND ${CMAKE_PROJECT_NAME} MATCHES "OpenMesh")
# Install Header Files # Install Header Files
install(DIRECTORY . install(DIRECTORY .