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

Merge branch 'More_cmake_cleanup' into 'master'

Browse Source 
More cmake cleanup

See merge request OpenMesh/OpenMesh!204
This commit is contained in:
Jan Möbius
2018-12-17 10:01:25 +01:00
parent 90db9c7c30 a74e899dde
commit 14052c8532
2 changed files with 8 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
cmake/ACGCommon.cmake
View File

@@ -87,15 +87,6 @@ else ()
set (ACG_PROJECT_BINDIR "bin") set (ACG_PROJECT_BINDIR "bin")
endif () endif ()
if( NOT APPLE )
# check 64 bit
if( CMAKE_SIZEOF_VOID_P MATCHES 4 )
set( HAVE_64_BIT 0 )
else( CMAKE_SIZEOF_VOID_P MATCHES 4 )
set( HAVE_64_BIT 1 )
endif( CMAKE_SIZEOF_VOID_P MATCHES 4 )
endif ( NOT APPLE )
# allow a project to modify the directories # allow a project to modify the directories
if (COMMAND acg_modify_project_dirs) if (COMMAND acg_modify_project_dirs)
acg_modify_project_dirs () acg_modify_project_dirs ()
@@ -115,7 +106,6 @@ macro (acg_set_target_props target)
SKIP_BUILD_RPATH 0 SKIP_BUILD_RPATH 0
) )
elseif (APPLE AND NOT ACG_PROJECT_MACOS_BUNDLE) elseif (APPLE AND NOT ACG_PROJECT_MACOS_BUNDLE)
if (NOT (CMAKE_MAJOR_VERSION LESS 3) )
# save rpath # save rpath
set_target_properties ( set_target_properties (
${target} PROPERTIES ${target} PROPERTIES
@@ -124,15 +114,6 @@ macro (acg_set_target_props target)
#BUILD_WITH_INSTALL_RPATH 1 #BUILD_WITH_INSTALL_RPATH 1
SKIP_BUILD_RPATH 0 SKIP_BUILD_RPATH 0
) )
else()
# save rpath via install name dir
set_target_properties (
${target} PROPERTIES
INSTALL_NAME_DIR "@executable_path/../${ACG_PROJECT_LIBDIR}"
#BUILD_WITH_INSTALL_RPATH 1
SKIP_BUILD_RPATH 0
)
endif(NOT (CMAKE_MAJOR_VERSION LESS 3) )
elseif (NOT APPLE) elseif (NOT APPLE)
set_target_properties ( set_target_properties (
@@ -162,35 +143,6 @@ macro (acg_set var value)
set (${var} ${value} CACHE INTERNAL "") set (${var} ${value} CACHE INTERNAL "")
endmacro () endmacro ()
# test for OpenMP
macro (acg_openmp)
if (NOT OPENMP_NOTFOUND)
find_package(OpenMP)
if (OPENMP_FOUND)
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
add_definitions(-DUSE_OPENMP)
else ()
set (OPENMP_NOTFOUND 1)
endif()
endif ()
endmacro ()
# test for FTGL
macro (acg_ftgl)
find_package (Freetype)
if (FREETYPE_FOUND)
find_package (FTGL)
if (FTGL_FOUND)
add_definitions (-DUSE_FTGL)
include_directories (${FTGL_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIR_freetype2})
set (FTGL_LIBS ${FREETYPE_LIBRARIES} ${FTGL_LIBRARIES})
endif ()
endif ()
endmacro ()
# append all files with extension "ext" in the "dirs" directories to "ret" # append all files with extension "ext" in the "dirs" directories to "ret"
# excludes all files starting with a '.' (dot) # excludes all files starting with a '.' (dot)
macro (acg_append_files ret ext) macro (acg_append_files ret ext)
@@ -206,22 +158,6 @@ macro (acg_append_files ret ext)
endforeach () endforeach ()
endmacro () endmacro ()
# append all files with extension "ext" in the "dirs" directories and its subdirectories to "ret"
# excludes all files starting with a '.' (dot)
macro (acg_append_files_recursive ret ext)
foreach (_dir ${ARGN})
file (GLOB_RECURSE _files "${_dir}/${ext}")
foreach (_file ${_files})
get_filename_component (_filename ${_file} NAME)
if (_filename MATCHES "^[.]")
list (REMOVE_ITEM _files ${_file})
endif ()
endforeach ()
list (APPEND ${ret} ${_files})
endforeach ()
endmacro ()
# drop all "*T.cc" files from list # drop all "*T.cc" files from list
macro (acg_drop_templates list) macro (acg_drop_templates list)
foreach (_file ${${list}}) foreach (_file ${${list}})
@@ -252,18 +188,6 @@ function (acg_copy_after_build target src dst)
endforeach () endforeach ()
endfunction () endfunction ()
# install the whole directory without svn files
function (acg_install_dir src dst)
acg_unset (_files)
acg_get_files_in_dir (_files ${src})
foreach (_file ${_files})
get_filename_component (_file_PATH ${_file} PATH)
install(FILES "${src}/${_file}"
DESTINATION "${dst}/${_file_PATH}"
)
endforeach ()
endfunction ()
# extended version of add_executable that also copies output to out Build directory # extended version of add_executable that also copies output to out Build directory
function (acg_add_executable _target) function (acg_add_executable _target)
add_executable (${_target} ${ARGN}) add_executable (${_target} ${ARGN})

15
cmake/ACGCompiler.cmake
View File

@@ -67,15 +67,6 @@ if (UNIX)
list(APPEND ADDITIONAL_C_RELEASE_FLAGS "-DINCLUDE_TEMPLATES" ) list(APPEND ADDITIONAL_C_RELEASE_FLAGS "-DINCLUDE_TEMPLATES" )
list(APPEND ADDITIONAL_C_RELWITHDEBINFO_FLAGS "-DINCLUDE_TEMPLATES" ) list(APPEND ADDITIONAL_C_RELWITHDEBINFO_FLAGS "-DINCLUDE_TEMPLATES" )
# Deprecated setting. Remove in future release, as the default template depth
# should be enough with state of the art compilers
# # Increase the template depth as this might be exceeded from time to time
# IF( NOT CMAKE_SYSTEM MATCHES "SunOS*")
# list(APPEND ADDITIONAL_CXX_DEBUG_FLAGS "-ftemplate-depth-100" )
# list(APPEND ADDITIONAL_CXX_RELEASE_FLAGS "-ftemplate-depth-100" )
# list(APPEND ADDITIONAL_CXX_RELWITHDEBINFO_FLAGS "-ftemplate-depth-100" )
# ENDIF()
################################################################################ ################################################################################
# OS Defines # OS Defines
################################################################################ ################################################################################
@@ -197,10 +188,4 @@ if (UNIX)
endif() endif()
endforeach() endforeach()
#TODO : Test and remove it?!
IF( CMAKE_SYSTEM MATCHES "SunOS*")
set (CMAKE_CFLAGS_RELEASE "-xO3")
set (CMAKE_CXX_FLAGS_RELEASE "-xO3")
endif ( CMAKE_SYSTEM MATCHES "SunOS*" )
endif () endif ()