lucaspalomodevelop/meshlab
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/meshlab.git synced 2026-03-16 09:34:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

other cleanups

Browse Source
This commit is contained in:
alemuntoni 2020-10-28 17:20:15 +01:00
parent 67289f8c9b
commit 1c5a251b2a
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/CMakeLists.txt
View File

@ -77,6 +77,22 @@ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
### Build Settings
add_definitions(-DMESHLAB_SCALAR=float)
if(WIN32)
add_definitions(-DNOMINMAX)
if(MSVC)
add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
endif()
endif()
### Install Settings
if (NOT APPLE)
set(CMAKE_INSTALL_RPATH $ORIGIN/../${MESHLAB_LIB_INSTALL_DIR};$ORIGIN/../${CMAKE_INSTALL_LIBDIR})
else()
SET(CMAKE_INSTALL_RPATH $ORIGIN/../Frameworks)
endif()
### Bundled dependencies in the "external" directory
set(EXTERNAL_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external)
include(${CMAKE_CURRENT_SOURCE_DIR}/external_common.cmake)
@ -85,9 +101,6 @@ if (NOT BUILD_MINI)
include(${EXTERNAL_DIR}/external.cmake)
endif()
### Common build settings for internal code
add_definitions(-DMESHLAB_SCALAR=float)
if(BUILD_STRICT AND NOT MSVC AND NOT APPLE)
# Make sure that our shared libraries were appropriately linked
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
@ -99,22 +112,9 @@ if (BUILD_STRICT AND APPLE)
set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-undefined,error")
endif()
if(WIN32)
add_definitions(-DNOMINMAX)
if(MSVC)
add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
endif()
endif()
### Enter subdirectories
add_subdirectory(common)
if (NOT APPLE)
set(CMAKE_INSTALL_RPATH $ORIGIN/../${MESHLAB_LIB_INSTALL_DIR};$ORIGIN/../${CMAKE_INSTALL_LIBDIR})
else()
SET(CMAKE_INSTALL_RPATH $ORIGIN/../Frameworks)
endif()
add_subdirectory(meshlab)
add_subdirectory(meshlabserver)
set(CMAKE_INSTALL_RPATH)
@ -233,7 +233,6 @@ endforeach()
set(COPIED_FILES)
# shaders
# TODO subdirs?
file(
GLOB SHADERS
LIST_DIRECTORIES false