"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/matlab/CMakeLists.txt" between
pfstools-2.1.0.tgz and pfstools-2.2.0.tgz

About: pfstools are a set of command line programs (and one GUI program) for reading, writing, manipulating, and viewing high-dynamic range (HDR) images and video frames (similar as the netpbm package does for low-dynamic range images).

CMakeLists.txt  (pfstools-2.1.0.tgz):CMakeLists.txt  (pfstools-2.2.0.tgz)
skipping to change at line 27 skipping to change at line 27
execute_process(COMMAND ${MATLAB_ROOT}/bin/mexext${SCRIPT_EXT} OUTPUT_VARIABLE M EX_EXT OUTPUT_STRIP_TRAILING_WHITESPACE) execute_process(COMMAND ${MATLAB_ROOT}/bin/mexext${SCRIPT_EXT} OUTPUT_VARIABLE M EX_EXT OUTPUT_STRIP_TRAILING_WHITESPACE)
message( "Matlab: mexext: ${MEX_EXT}" ) message( "Matlab: mexext: ${MEX_EXT}" )
set(SRCMEX pfsclose.cpp pfsopen.cpp pfspopen.cpp pfsput.cpp pfsget.cpp pfs_trans form_colorspace.cpp pfspclose.cpp) set(SRCMEX pfsclose.cpp pfsopen.cpp pfspopen.cpp pfsput.cpp pfsget.cpp pfs_trans form_colorspace.cpp pfspclose.cpp)
set(SRCM Contents.m pfs_read_image.m pfs_read_luminance.m set(SRCM Contents.m pfs_read_image.m pfs_read_luminance.m
pfs_read_rgb.m pfs_read_xyz.m pfs_shell.m pfs_test_shell.m pfs_read_rgb.m pfs_read_xyz.m pfs_shell.m pfs_test_shell.m
pfs_write_image.m pfs_write_luminance.m pfs_write_rgb.m pfs_write_image.m pfs_write_luminance.m pfs_write_rgb.m
pfs_write_xyz.m pfsview.m pfs_fix_path.m pfs_exec.m) pfs_write_xyz.m pfsview.m pfs_fix_path.m pfs_exec.m)
cmake_policy(SET CMP0018 OLD) #cmake_policy(SET CMP0018 OLD)
#cmake_policy(SET CMP0042 OLD) This policy is not recognized in cmake version 2. 8.12.2 #cmake_policy(SET CMP0042 OLD) This policy is not recognized in cmake version 2. 8.12.2
SET( CMAKE_CXX_COMPILER ${MATLAB_MEX} ) SET( CMAKE_CXX_COMPILER ${MATLAB_MEX} )
SET( CMAKE_C_COMPILER ${MATLAB_MEX} ) SET( CMAKE_C_COMPILER ${MATLAB_MEX} )
# Suffix and Prefix of the output target file # Suffix and Prefix of the output target file
SET( CMAKE_SHARED_LIBRARY_SUFFIX ".${MEX_EXT}" ) # set suffix to .mexa64 SET( CMAKE_SHARED_LIBRARY_SUFFIX ".${MEX_EXT}" ) # set suffix to .mexa64
SET( CMAKE_SHARED_LIBRARY_PREFIX ) # remove the "lib" prefix SET( CMAKE_SHARED_LIBRARY_PREFIX ) # remove the "lib" prefix
# Variables controlling the build-phrase # Variables controlling the build-phrase
SET( CMAKE_CXX_FLAGS "-cxx -largeArrayDims" ) SET( CMAKE_CXX_FLAGS "-cxx -largeArrayDims" )
#SET( CMAKE_CXX_FLAGS "-cxx -largeArrayDims CXXFLAGS='$$CXXFLAGS -std=c++11'" ) #SET( CMAKE_CXX_FLAGS "-cxx -largeArrayDims CXXFLAGS='$$CXXFLAGS -std=c++11'" )
SET( CMAKE_SHARED_LIBRARY_CXX_FLAGS ) # remove the -fPIC option. mex does not accept the "-fPIC" option #SET( CMAKE_SHARED_LIBRARY_CXX_FLAGS ) # remove the -fPIC option. mex does not accept the "-fPIC" option
get_property(inc_dirs DIRECTORY PROPERTY INCLUDE_DIRECTORIES) get_property(inc_dirs DIRECTORY PROPERTY INCLUDE_DIRECTORIES)
set( INC_FLAGS "" ) set( INC_FLAGS "" )
foreach( IDIR ${inc_dirs} ) foreach( IDIR ${inc_dirs} )
set( INC_FLAGS "${INC_FLAGS} -I${IDIR}" ) set( INC_FLAGS "${INC_FLAGS} -I${IDIR}" )
endforeach( IDIR ) endforeach( IDIR )
if( CYGWIN ) if( CYGWIN )
# This is ugly but necessary to work around CMake limitations # This is ugly but necessary to work around CMake limitations
# The compiled objects need to be copied to ensure that the dependency ch eck works # The compiled objects need to be copied to ensure that the dependency ch eck works
skipping to change at line 108 skipping to change at line 108
add_definitions(-DMATLAB_MEX_FILE) add_definitions(-DMATLAB_MEX_FILE)
foreach(SRC ${SRCMEX}) foreach(SRC ${SRCMEX})
get_filename_component(MEXNAME ${SRC} NAME_WE) get_filename_component(MEXNAME ${SRC} NAME_WE)
add_library(${MEXNAME} SHARED ${SRC} mex_utils.cpp ${PFS_LIB_SRC} ${MEXDEFFILE }) add_library(${MEXNAME} SHARED ${SRC} mex_utils.cpp ${PFS_LIB_SRC} ${MEXDEFFILE })
# target_link_libraries(${MEXNAME} pfs ${MATLAB_LIBRARIES}) # target_link_libraries(${MEXNAME} pfs ${MATLAB_LIBRARIES})
# target_link_libraries(${MEXNAME} pfs ) # target_link_libraries(${MEXNAME} pfs )
# set_target_properties(${MEXNAME} PROPERTIES PREFIX "" SUFFIX # set_target_properties(${MEXNAME} PROPERTIES PREFIX "" SUFFIX
#".${MEX_EXT}") #".${MEX_EXT}")
set_property(TARGET ${MEXNAME} PROPERTY POSITION_INDEPENDENT_CODE OFF) # remov
e the -fPIC option. mex does not accept the "-fPIC" option
install (TARGETS ${MEXNAME} DESTINATION ${MATLAB_DEST_DIR}) install (TARGETS ${MEXNAME} DESTINATION ${MATLAB_DEST_DIR})
install (FILES ${MEXNAME}.m DESTINATION ${MATLAB_DEST_DIR}) install (FILES ${MEXNAME}.m DESTINATION ${MATLAB_DEST_DIR})
endforeach(SRC) endforeach(SRC)
foreach(SRC ${SRCM}) foreach(SRC ${SRCM})
install (FILES ${SRC} DESTINATION ${MATLAB_DEST_DIR}) install (FILES ${SRC} DESTINATION ${MATLAB_DEST_DIR})
endforeach(SRC) endforeach(SRC)
 End of changes. 3 change blocks. 
2 lines changed or deleted 5 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)