CMakeLists.txt (pfstools-2.1.0.tgz) | : | CMakeLists.txt (pfstools-2.2.0.tgz) | ||
---|---|---|---|---|
skipping to change at line 19 | skipping to change at line 19 | |||
set(CPACK_PACKAGE_VERSION_PATCH 0) | set(CPACK_PACKAGE_VERSION_PATCH 0) | |||
set(CPACK_SOURCE_IGNORE_FILES | set(CPACK_SOURCE_IGNORE_FILES | |||
"~$" | "~$" | |||
"\\\\.cvsignore$" | "\\\\.cvsignore$" | |||
"^${PROJECT_SOURCE_DIR}.*/CVS/" | "^${PROJECT_SOURCE_DIR}.*/CVS/" | |||
"^${PROJECT_SOURCE_DIR}/debian/" | "^${PROJECT_SOURCE_DIR}/debian/" | |||
"^${PROJECT_SOURCE_DIR}/old/" | "^${PROJECT_SOURCE_DIR}/old/" | |||
) | ) | |||
include( CPack ) | include( CPack ) | |||
#SET(ZLIB_DIR "e:/zlib/") | #cmake_policy(SET CMP0074 NEW) | |||
# This gets rid of some warning messages in MSVC | ||||
add_definitions(-D_CRT_SECURE_NO_WARNINGS) | ||||
#SET(ZLIB_DIR "C:/Users/manti/Documents/projects/vs2019_libs") | ||||
#SET(CMAKE_INCLUDE_PATH ${ZLIB_DIR}/include ${CMAKE_INCLUDE_PATH}) | #SET(CMAKE_INCLUDE_PATH ${ZLIB_DIR}/include ${CMAKE_INCLUDE_PATH}) | |||
#SET(CMAKE_LIBRARY_PATH ${ZLIB_DIR}/ ${ZLIB_DIR}/lib ${CMAKE_LIBRARY_PATH}) | #SET(CMAKE_LIBRARY_PATH ${ZLIB_DIR}/ ${ZLIB_DIR}/lib ${CMAKE_LIBRARY_PATH}) | |||
#set(CMAKE_PREFIX_PATH "C:\\Qt\\5.15.2\\msvc2019_64") | ||||
if( "${CYGWIN}" STREQUAL "" ) | if( "${CYGWIN}" STREQUAL "" ) | |||
set(CYGWIN 0) | set(CYGWIN 0) | |||
endif( "${CYGWIN}" STREQUAL "" ) | endif( "${CYGWIN}" STREQUAL "" ) | |||
set (pfstools_VERSION_MAJOR ${CPACK_PACKAGE_VERSION_MAJOR}) | set (pfstools_VERSION_MAJOR ${CPACK_PACKAGE_VERSION_MAJOR}) | |||
set (pfstools_VERSION_MINOR ${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSI ON_PATCH}) | set (pfstools_VERSION_MINOR ${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSI ON_PATCH}) | |||
set (pfslib_version 1.2) | set (pfslib_version 1.2) | |||
set(CMAKE_LEGACY_CYGWIN_WIN32 0) | set(CMAKE_LEGACY_CYGWIN_WIN32 0) | |||
skipping to change at line 214 | skipping to change at line 220 | |||
elseif( MATLAB_FOUND ) | elseif( MATLAB_FOUND ) | |||
message( STATUS "Matlab or mex compiler not found. Matlab integration will n ot be compiled." ) | message( STATUS "Matlab or mex compiler not found. Matlab integration will n ot be compiled." ) | |||
endif( MATLAB_FOUND ) | endif( MATLAB_FOUND ) | |||
endif( WITH_MATLAB ) | endif( WITH_MATLAB ) | |||
#include( FindPkgConfig.cmake ) | #include( FindPkgConfig.cmake ) | |||
# ======== OpenGL =========== | # ======== OpenGL =========== | |||
set(OpenGL_GL_PREFERENCE GLVND) | ||||
OPTION(WITH_pfsglview "Compile pfsglview, requires OpenGL and GLUT" ON) | OPTION(WITH_pfsglview "Compile pfsglview, requires OpenGL and GLUT" ON) | |||
if( WITH_pfsglview ) | if( WITH_pfsglview ) | |||
find_path(OPENGL_INCLUDE_DIR GL/gl.h ) | find_path(OPENGL_INCLUDE_DIR GL/gl.h ) | |||
find_package(OpenGL ) | find_package(OpenGL ) | |||
find_package(GLUT ) | find_package(GLUT ) | |||
if( NOT OPENGL_FOUND ) | if( NOT OPENGL_FOUND ) | |||
End of changes. 3 change blocks. | ||||
1 lines changed or deleted | 9 lines changed or added |