From: <tks...@us...> - 2009-08-04 04:16:30
|
Revision: 1018 http://panotools.svn.sourceforge.net/panotools/?rev=1018&view=rev Author: tksharpless Date: 2009-08-04 04:16:17 +0000 (Tue, 04 Aug 2009) Log Message: ----------- Added CMakeLists.txt to build libpano13 (only) in the Hugin build environment. Works with MSVC 2008 Exp. & Hugin SDK on WinVista. Please test elsewhere. Also untested is the option of including support for the Java utilities (left out by default). Added Paths: ----------- trunk/libpano/CMakeLists.txt Added: trunk/libpano/CMakeLists.txt =================================================================== --- trunk/libpano/CMakeLists.txt (rev 0) +++ trunk/libpano/CMakeLists.txt 2009-08-04 04:16:17 UTC (rev 1018) @@ -0,0 +1,178 @@ +## cmakelists.txt for libpano13 in a Hugin build environment. +## 03 Aug 2009 TKSharpless +## +## The libpano root (that contains this file) must have the +## same parent directory as the hugin root. On Windows, +## that parent must be the Hugin SDK root. Most dependencies +## will then be found in the wxWidgets package there. Note: +## you may have to edit the wxWidgets directory name below. +## +## The Java interface to ptpicker and pteditor is optional. +## If HAVE_JAVA is defined, this script includes the ptpicker +## and pteditor support modules in libpano. The standard Java +## header jni.h and its dependencies must then be in your include +## search path (this script does not find them). + +# require at least cmake 2.4 +cmake_minimum_required(VERSION 2.4) + +## get common parent dir of us and hugin (Hugin SDK on Windows) +GET_FILENAME_COMPONENT( SOURCE_BASE_DIR ${CMAKE_SOURCE_DIR} PATH CACHE ) +## load the Hugin cmake modules +set(CMAKE_MODULE_PATH ${SOURCE_BASE_DIR}/hugin/CMakeModules ) +include(HuginMacros) +include(CheckIncludeFiles) + +## global setup +project(libpano13) + +## +## wxWidgets +## +# This must come before FINDs for tiff, jpeg, png, zlib to enable +# finding the wxWidgets distributions of those packages (Win32 only). +IF (WIN32) + SET(wxWidgets_ROOT_DIR ${SOURCE_BASE_DIR}/wxWidgets-2.8.10) +ENDIF(WIN32) + +FIND_PACKAGE(wxWidgets REQUIRED) + +## +## Graphics libraries +## +# wxWidgets sub-packages will be used if native ones aren't found + +FIND_PACKAGE(TIFF REQUIRED) +INCLUDE_DIRECTORIES(${TIFF_INCLUDE_DIR}) +FIND_PACKAGE(JPEG REQUIRED) +INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR}) +FIND_PACKAGE(PNG REQUIRED) +INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR}) +INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR}) + +# +# Check build type and set options accordingly +# +IF(NOT CMAKE_BUILD_TYPE) + SET(CMAKE_BUILD_TYPE Release CACHE STRING + "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." + FORCE) +ENDIF(NOT CMAKE_BUILD_TYPE) +IF(${CMAKE_BUILD_TYPE} STREQUAL "Debug") + ADD_DEFINITIONS(-DDEBUG) + IF(UNIX) + ADD_DEFINITIONS(-Wall) + ENDIF(UNIX) +ENDIF(${CMAKE_BUILD_TYPE} STREQUAL "Debug") + +IF (UNIX) + IF( HAVE_JAVA ) + ADD_DEFINITIONS( -Dhave_Java ) + ENDIF( HAVE_JAVA ) +ELSE (UNIX) + IF (MSVC) + IF( HAVE_JAVA ) + ADD_DEFINITIONS( /Dhave_Java ) + ENDIF( HAVE_JAVA ) + # Stop MSVC8 from bitching about the C library + ADD_DEFINITIONS(/D_CRT_SECURE_NO_DEPRECATE) + # Stop MSVC9 from bitching about possibly invalid STL usage + ADD_DEFINITIONS(/D_SCL_SECURE_NO_WARNINGS) + # Stop MSVC9 from bitching about POSIX names without underscores + ADD_DEFINITIONS(/D_CRT_NONSTDC_NO_DEPRECATE) + # compile everything for the static C runtime + FOREACH(TYPE C CXX) + # makefiles use blank configuration + FOREACH(CFG "_DEBUG" "_MINSIZEREL" "_RELEASE" "_RELWITHDEBINFO") + #MESSAGE("Replacing CMAKE_${TYPE}_FLAGS${CFG}: ${CMAKE_${TYPE}_FLAGS${CFG}}") + SET(NEW_FLAGS "${CMAKE_${TYPE}_FLAGS${CFG}}") + # fix up static libc flags + STRING(REPLACE "/MD" "/MT" NEW_FLAGS "${NEW_FLAGS}") + # *FORCE* to override whats already placed into the cache + SET(CMAKE_${TYPE}_FLAGS${CFG} "${NEW_FLAGS}" CACHE STRING + "CMAKE_${TYPE}_FLAGS${CFG} (overwritten to ensure static build)" FORCE) + #MESSAGE("New CMAKE_${TYPE}_FLAGS${CFG}: ${CMAKE_${TYPE}_FLAGS${CFG}}") + ENDFOREACH(CFG) + ENDFOREACH(TYPE) + # link only with the static C runtime !! THIS IS A MUST !! + SET(NEW_FLAGS "${CMAKE_EXE_LINKER_FLAGS}") + # ensure that the flags are not duplicaated on subsequent runs + STRING(REPLACE " /NODEFAULTLIB:\"MSVCRT.lib\" /NODEFAULTLIB:\"MSVCRTd.lib\"" "" NEW_FLAGS "${NEW_FLAGS}") + # note that flag names (NODEFAULTLIB) etc.) are case sensitive + SET( CMAKE_EXE_LINKER_FLAGS + "${NEW_FLAGS} /NODEFAULTLIB:\"MSVCRT.lib\" /NODEFAULTLIB:\"MSVCRTd.lib\"" + CACHE STRING "for MSVC" FORCE + ) + ENDIF(MSVC) +ENDIF (UNIX) + +## +## Here is the part that builds libpano +## +if ( HAVE_JAVA ) + set( java_h pteditor.h ptutils.h ) + set( java_c ptpicker.c pteditor.c ) +endif ( HAVE_JAVA ) + +set( pano13_hdr + ${java_h} + ColourBrightness.h + f2c.h + fftn.h + filter.h + panorama.h + pt_stdint.h + PTcommon.h + rgbe.h + sys_ansi.h + sys_win.h + version.h + ZComb.h +) + +set( pano13_res + pano13.rc + pano13vc.def +) + +set( pano13_src + ${java_c} + adjust.c + bmp.c + ColourBrightness.c + correct.c + fftn.c + file.c + filter.c + fourier.c + hdrfile.c + jpeg.c + jpegicc.c + lmdif.c + math.c + metadata.c + morpher.c + multilayer.c + optimize.c + pan.c + parser.c + perspect.c + png.c + ppm.c + PTcommon.c + PTDialogs.c + ptfeather.c + ptstitch.c + queryfeature.c + remap.c + resample.c + rgbe.c + seamer.c + sys_ansi.c + sys_common.c + tiff.c + Triangulate.c + ZComb.c +) + +add_library ( libpano13 ${pano13_hdr} ${pano13_res} ${pano13_src} ) \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tks...@us...> - 2009-08-04 12:36:21
|
Revision: 1019 http://panotools.svn.sourceforge.net/panotools/?rev=1019&view=rev Author: tksharpless Date: 2009-08-04 12:35:47 +0000 (Tue, 04 Aug 2009) Log Message: ----------- Can define HUGIN_BASE_DIR on the CMake commandline to locate the Hugin source root (by default it must be next to the libpano source root and be called hugin). Modified Paths: -------------- trunk/libpano/CMakeLists.txt Modified: trunk/libpano/CMakeLists.txt =================================================================== --- trunk/libpano/CMakeLists.txt 2009-08-04 04:16:17 UTC (rev 1018) +++ trunk/libpano/CMakeLists.txt 2009-08-04 12:35:47 UTC (rev 1019) @@ -16,10 +16,16 @@ # require at least cmake 2.4 cmake_minimum_required(VERSION 2.4) -## get common parent dir of us and hugin (Hugin SDK on Windows) +## get name of our parent directory GET_FILENAME_COMPONENT( SOURCE_BASE_DIR ${CMAKE_SOURCE_DIR} PATH CACHE ) + +IF ( HUGIN_BASE_DIR ) + set(CMAKE_MODULE_PATH ${HUGIN_BASE_DIR}/CMakeModules ) +ELSE ( HUGIN_BASE_DIR ) + set(CMAKE_MODULE_PATH ${SOURCE_BASE_DIR}/hugin/CMakeModules ) +ENDIF ( HUGIN_BASE_DIR ) + ## load the Hugin cmake modules -set(CMAKE_MODULE_PATH ${SOURCE_BASE_DIR}/hugin/CMakeModules ) include(HuginMacros) include(CheckIncludeFiles) @@ -66,14 +72,8 @@ ENDIF(${CMAKE_BUILD_TYPE} STREQUAL "Debug") IF (UNIX) - IF( HAVE_JAVA ) - ADD_DEFINITIONS( -Dhave_Java ) - ENDIF( HAVE_JAVA ) ELSE (UNIX) IF (MSVC) - IF( HAVE_JAVA ) - ADD_DEFINITIONS( /Dhave_Java ) - ENDIF( HAVE_JAVA ) # Stop MSVC8 from bitching about the C library ADD_DEFINITIONS(/D_CRT_SECURE_NO_DEPRECATE) # Stop MSVC9 from bitching about possibly invalid STL usage This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tks...@us...> - 2009-08-04 12:48:18
|
Revision: 1020 http://panotools.svn.sourceforge.net/panotools/?rev=1020&view=rev Author: tksharpless Date: 2009-08-04 12:48:11 +0000 (Tue, 04 Aug 2009) Log Message: ----------- Improved version of previous mod to CMakeLists.txt Modified Paths: -------------- trunk/libpano/CMakeLists.txt Modified: trunk/libpano/CMakeLists.txt =================================================================== --- trunk/libpano/CMakeLists.txt 2009-08-04 12:35:47 UTC (rev 1019) +++ trunk/libpano/CMakeLists.txt 2009-08-04 12:48:11 UTC (rev 1020) @@ -16,12 +16,12 @@ # require at least cmake 2.4 cmake_minimum_required(VERSION 2.4) -## get name of our parent directory -GET_FILENAME_COMPONENT( SOURCE_BASE_DIR ${CMAKE_SOURCE_DIR} PATH CACHE ) - +## Locate the hugin source root and its parent directory IF ( HUGIN_BASE_DIR ) + GET_FILENAME_COMPONENT( SOURCE_BASE_DIR ${HUGIN_SOURCE_DIR} PATH CACHE ) set(CMAKE_MODULE_PATH ${HUGIN_BASE_DIR}/CMakeModules ) ELSE ( HUGIN_BASE_DIR ) + GET_FILENAME_COMPONENT( SOURCE_BASE_DIR ${CMAKE_SOURCE_DIR} PATH CACHE ) set(CMAKE_MODULE_PATH ${SOURCE_BASE_DIR}/hugin/CMakeModules ) ENDIF ( HUGIN_BASE_DIR ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tks...@us...> - 2009-08-04 13:52:32
|
Revision: 1021 http://panotools.svn.sourceforge.net/panotools/?rev=1021&view=rev Author: tksharpless Date: 2009-08-04 13:52:16 +0000 (Tue, 04 Aug 2009) Log Message: ----------- Add Bruno's patch for Linux to CMakeLists.txt Modified Paths: -------------- trunk/libpano/CMakeLists.txt Modified: trunk/libpano/CMakeLists.txt =================================================================== --- trunk/libpano/CMakeLists.txt 2009-08-04 12:48:11 UTC (rev 1020) +++ trunk/libpano/CMakeLists.txt 2009-08-04 13:52:16 UTC (rev 1021) @@ -1,18 +1,27 @@ ## cmakelists.txt for libpano13 in a Hugin build environment. -## 03 Aug 2009 TKSharpless +## 03-04 Aug 2009 TKSharpless ## -## The libpano root (that contains this file) must have the -## same parent directory as the hugin root. On Windows, -## that parent must be the Hugin SDK root. Most dependencies -## will then be found in the wxWidgets package there. Note: -## you may have to edit the wxWidgets directory name below. +## Builds libpano13 only, by default without support for the +## Java programs ptpicker and pteditor. To include that, you +## can define HAVE_JAVA on the CMake command line. The Java +## header jni.h and its dependencies must then be in your +## include search path (this script does not find them). +## +## This script uses the Hugin CMake modules to find required +## image file format libraries, so it needs to know the name +## of the Hign source tree root. By default that must be +## "../hugin" relative to the libpano root (that contains +## this file). But you can set HUGIN_BASE_DIR to the path +## name of the Hugin root on the CMake command line. ## -## The Java interface to ptpicker and pteditor is optional. -## If HAVE_JAVA is defined, this script includes the ptpicker -## and pteditor support modules in libpano. The standard Java -## header jni.h and its dependencies must then be in your include -## search path (this script does not find them). +## The parent directory of the Hugin root is one place where +## dependencies will be looked for. On Windows that should +## be the root directory of the Hugin SDK, and the wxWidgets +## package will likely supply the dependencies. Note: you +## may need to edit the wxWidgets version number below. +## + # require at least cmake 2.4 cmake_minimum_required(VERSION 2.4) @@ -36,9 +45,10 @@ ## wxWidgets ## # This must come before FINDs for tiff, jpeg, png, zlib to enable -# finding the wxWidgets distributions of those packages (Win32 only). +# finding the wxWidgets distributions of those packages on Windows. IF (WIN32) SET(wxWidgets_ROOT_DIR ${SOURCE_BASE_DIR}/wxWidgets-2.8.10) + ADD_DEFINITIONS(-D__Win__) ENDIF(WIN32) FIND_PACKAGE(wxWidgets REQUIRED) @@ -72,6 +82,7 @@ ENDIF(${CMAKE_BUILD_TYPE} STREQUAL "Debug") IF (UNIX) + ADD_DEFINITIONS(-D__Ansi__) ELSE (UNIX) IF (MSVC) # Stop MSVC8 from bitching about the C library @@ -137,6 +148,7 @@ set( pano13_src ${java_c} + ${win_c} adjust.c bmp.c ColourBrightness.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kor...@us...> - 2009-09-18 23:36:04
|
Revision: 1064 http://panotools.svn.sourceforge.net/panotools/?rev=1064&view=rev Author: kornelbenko Date: 2009-09-18 23:35:54 +0000 (Fri, 18 Sep 2009) Log Message: ----------- Create symbolic links to libpano13.so Modified Paths: -------------- trunk/libpano/CMakeLists.txt Modified: trunk/libpano/CMakeLists.txt =================================================================== --- trunk/libpano/CMakeLists.txt 2009-09-18 22:35:09 UTC (rev 1063) +++ trunk/libpano/CMakeLists.txt 2009-09-18 23:35:54 UTC (rev 1064) @@ -198,8 +198,10 @@ ) add_library ( pano13 SHARED ${pano13_hdr} ${pano13_res} ${pano13_src} ) +set_target_properties(pano13 PROPERTIES VERSION "1.0.0" SOVERSION "1") -install(TARGETS pano13 DESTINATION lib) +install(TARGETS pano13 LIBRARY DESTINATION lib) + install(FILES ${pano13_install_hdr} DESTINATION "include/pano13") set(TOP_SRC_DIR ${CMAKE_SOURCE_DIR}) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tks...@us...> - 2009-09-19 02:42:06
|
Revision: 1065 http://panotools.svn.sourceforge.net/panotools/?rev=1065&view=rev Author: tksharpless Date: 2009-09-19 02:41:59 +0000 (Sat, 19 Sep 2009) Log Message: ----------- CMakeLists.txt now requires version 2.6 Modified Paths: -------------- trunk/libpano/CMakeLists.txt Modified: trunk/libpano/CMakeLists.txt =================================================================== --- trunk/libpano/CMakeLists.txt 2009-09-18 23:35:54 UTC (rev 1064) +++ trunk/libpano/CMakeLists.txt 2009-09-19 02:41:59 UTC (rev 1065) @@ -22,8 +22,8 @@ ## -# require at least cmake 2.4 -cmake_minimum_required(VERSION 2.4) +# requires at least cmake 2.6, now +cmake_minimum_required(VERSION 2.6) ## Locate the hugin source root and its parent directory IF ( HUGIN_BASE_DIR ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kor...@us...> - 2009-09-19 17:26:56
|
Revision: 1071 http://panotools.svn.sourceforge.net/panotools/?rev=1071&view=rev Author: kornelbenko Date: 2009-09-19 17:26:49 +0000 (Sat, 19 Sep 2009) Log Message: ----------- use javastub.c if noa java available Modified Paths: -------------- trunk/libpano/CMakeLists.txt Modified: trunk/libpano/CMakeLists.txt =================================================================== --- trunk/libpano/CMakeLists.txt 2009-09-19 15:06:10 UTC (rev 1070) +++ trunk/libpano/CMakeLists.txt 2009-09-19 17:26:49 UTC (rev 1071) @@ -125,6 +125,8 @@ if ( HAVE_JAVA ) set( java_h pteditor.h ptutils.h ) set( java_c ptpicker.c pteditor.c ) +else() + set(java_c javastub.c) endif ( HAVE_JAVA ) set(pano13_install_hdr This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kor...@us...> - 2009-09-20 06:53:00
|
Revision: 1073 http://panotools.svn.sourceforge.net/panotools/?rev=1073&view=rev Author: kornelbenko Date: 2009-09-20 06:52:49 +0000 (Sun, 20 Sep 2009) Log Message: ----------- white space Modified Paths: -------------- trunk/libpano/CMakeLists.txt Modified: trunk/libpano/CMakeLists.txt =================================================================== --- trunk/libpano/CMakeLists.txt 2009-09-19 19:06:07 UTC (rev 1072) +++ trunk/libpano/CMakeLists.txt 2009-09-20 06:52:49 UTC (rev 1073) @@ -1,16 +1,16 @@ ## cmakelists.txt for libpano13 in a Hugin build environment. ## 03-04 Aug 2009 TKSharpless -## +## ## Builds libpano13 only, by default without support for the ## Java programs ptpicker and pteditor. To include that, you -## can define HAVE_JAVA on the CMake command line. The Java -## header jni.h and its dependencies must then be in your -## include search path (this script does not find them). -## +## can define HAVE_JAVA on the CMake command line. The Java +## header jni.h and its dependencies must then be in your +## include search path(this script does not find them). +## ## This script uses the Hugin CMake modules to find required -## image file format libraries, so it needs to know the name -## of the Hign source tree root. By default that must be -## "../hugin" relative to the libpano root (that contains +## image file format libraries, so it needs to know the name +## of the Hign source tree root. By default that must be +## "../hugin" relative to the libpano root(that contains ## this file). But you can set HUGIN_BASE_DIR to the path ## name of the Hugin root on the CMake command line. ## @@ -26,13 +26,13 @@ cmake_minimum_required(VERSION 2.6) ## Locate the hugin source root and its parent directory -IF ( HUGIN_BASE_DIR ) - GET_FILENAME_COMPONENT( SOURCE_BASE_DIR ${HUGIN_BASE_DIR} PATH CACHE ) - set(CMAKE_MODULE_PATH ${HUGIN_BASE_DIR}/CMakeModules ) -ELSE ( HUGIN_BASE_DIR ) - GET_FILENAME_COMPONENT( SOURCE_BASE_DIR ${CMAKE_SOURCE_DIR} PATH CACHE ) - set(CMAKE_MODULE_PATH ${SOURCE_BASE_DIR}/hugin/CMakeModules ) -ENDIF ( HUGIN_BASE_DIR ) +IF(HUGIN_BASE_DIR) + GET_FILENAME_COMPONENT(SOURCE_BASE_DIR ${HUGIN_BASE_DIR} PATH CACHE) + set(CMAKE_MODULE_PATH ${HUGIN_BASE_DIR}/CMakeModules) +ELSE(HUGIN_BASE_DIR) + GET_FILENAME_COMPONENT(SOURCE_BASE_DIR ${CMAKE_SOURCE_DIR} PATH CACHE) + set(CMAKE_MODULE_PATH ${SOURCE_BASE_DIR}/hugin/CMakeModules) +ENDIF(HUGIN_BASE_DIR) if(WIN32) ## load the Hugin cmake modules @@ -48,7 +48,7 @@ ## # This must come before FINDs for tiff, jpeg, png, zlib to enable # finding the wxWidgets distributions of those packages on Windows. -IF (WIN32) +IF(WIN32) SET(wxWidgets_ROOT_DIR ${SOURCE_BASE_DIR}/wxWidgets-2.8.10) ADD_DEFINITIONS(-D__Win__) FIND_PACKAGE(wxWidgets REQUIRED) @@ -70,7 +70,7 @@ # # Check build type and set options accordingly -# +# IF(NOT CMAKE_BUILD_TYPE) SET(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." @@ -83,10 +83,10 @@ ENDIF(UNIX) ENDIF(${CMAKE_BUILD_TYPE} STREQUAL "Debug") -IF (UNIX) +IF(UNIX) ADD_DEFINITIONS(-D__Ansi__) -ELSE (UNIX) - IF (MSVC) +ELSE(UNIX) + IF(MSVC) # Stop MSVC8 from bitching about the C library ADD_DEFINITIONS(/D_CRT_SECURE_NO_DEPRECATE) # Stop MSVC9 from bitching about possibly invalid STL usage @@ -111,23 +111,23 @@ SET(NEW_FLAGS "${CMAKE_EXE_LINKER_FLAGS}") # ensure that the flags are not duplicaated on subsequent runs STRING(REPLACE " /NODEFAULTLIB:\"MSVCRT.lib\" /NODEFAULTLIB:\"MSVCRTd.lib\"" "" NEW_FLAGS "${NEW_FLAGS}") - # note that flag names (NODEFAULTLIB) etc.) are case sensitive - SET( CMAKE_EXE_LINKER_FLAGS + # note that flag names(NODEFAULTLIB) etc.) are case sensitive + SET(CMAKE_EXE_LINKER_FLAGS "${NEW_FLAGS} /NODEFAULTLIB:\"MSVCRT.lib\" /NODEFAULTLIB:\"MSVCRTd.lib\"" CACHE STRING "for MSVC" FORCE - ) +) ENDIF(MSVC) -ENDIF (UNIX) +ENDIF(UNIX) ## ## Here is the part that builds libpano ## -if ( HAVE_JAVA ) - set( java_h pteditor.h ptutils.h ) - set( java_c ptpicker.c pteditor.c ) +if(HAVE_JAVA) + set(java_h pteditor.h ptutils.h) + set(java_c ptpicker.c pteditor.c) else() set(java_c javastub.c) -endif ( HAVE_JAVA ) +endif(HAVE_JAVA) set(pano13_install_hdr panorama.h @@ -141,27 +141,27 @@ pteditor.h ptutils.h) -set( pano13_hdr +set(pano13_hdr ${java_h} ${pano13_install_hdr} ColourBrightness.h f2c.h fftn.h rgbe.h - sys_ansi.h - sys_win.h + sys_ansi.h + sys_win.h ZComb.h ) -set( pano13_res +set(pano13_res pano13.rc pano13vc.def ) -set( pano13_src +set(pano13_src ${java_c} ${win_c} - adjust.c + adjust.c bmp.c ColourBrightness.c correct.c @@ -199,7 +199,7 @@ ZComb.c ) -add_library ( pano13 SHARED ${pano13_hdr} ${pano13_res} ${pano13_src} ) +add_library (pano13 SHARED ${pano13_hdr} ${pano13_res} ${pano13_src}) set_target_properties(pano13 PROPERTIES VERSION "1.0.0" SOVERSION "1") install(TARGETS pano13 LIBRARY DESTINATION lib) @@ -223,7 +223,7 @@ endmacro(setstripped) file(STRINGS "${TOP_SRC_DIR}/configure.ac" _config_lines) -foreach(_c_l ${_config_lines} ) +foreach(_c_l ${_config_lines}) if(_c_l MATCHES "^AC_INIT\\(\\[\([^,]+\)\\], *\\[\([^,]+\)\\], *\([^,]+\)") setstripped(PACKAGE_BASE ${CMAKE_MATCH_1}) setstripped(PACKAGE_VERSION ${CMAKE_MATCH_2}) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kor...@us...> - 2009-09-27 07:11:45
|
Revision: 1084 http://panotools.svn.sourceforge.net/panotools/?rev=1084&view=rev Author: kornelbenko Date: 2009-09-27 07:11:34 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Add top source directory for includes (This is, where nowadays some include files like PTcommon.h are found now) Modified Paths: -------------- trunk/libpano/CMakeLists.txt Modified: trunk/libpano/CMakeLists.txt =================================================================== --- trunk/libpano/CMakeLists.txt 2009-09-26 20:41:15 UTC (rev 1083) +++ trunk/libpano/CMakeLists.txt 2009-09-27 07:11:34 UTC (rev 1084) @@ -199,8 +199,9 @@ tiff.c Triangulate.c ZComb.c -) - +) +# We have some header files at top source level now +include_directories(${CMAKE_SOURCE_DIR}) add_library(pano13 SHARED ${pano13_hdr} ${pano13_res} ${pano13_src}) add_library(pano13a STATIC ${pano13_hdr} ${pano13_res} ${pano13_src}) set_target_properties(pano13 PROPERTIES VERSION "2.0.0" SOVERSION "2") This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bru...@us...> - 2009-09-27 09:30:58
|
Revision: 1085 http://panotools.svn.sourceforge.net/panotools/?rev=1085&view=rev Author: brunopostle Date: 2009-09-27 09:30:50 +0000 (Sun, 27 Sep 2009) Log Message: ----------- Unify mixed line endings Modified Paths: -------------- trunk/libpano/CMakeLists.txt Modified: trunk/libpano/CMakeLists.txt =================================================================== --- trunk/libpano/CMakeLists.txt 2009-09-27 07:11:34 UTC (rev 1084) +++ trunk/libpano/CMakeLists.txt 2009-09-27 09:30:50 UTC (rev 1085) @@ -1,293 +1,293 @@ -## cmakelists.txt for libpano13 in a Hugin build environment. -## 03-04 Aug 2009 TKSharpless -## -## Builds libpano13 only, by default without support for the -## Java programs ptpicker and pteditor. To include that, you -## can define HAVE_JAVA on the CMake command line. The Java -## header jni.h and its dependencies must then be in your -## include search path(this script does not find them). -## -## This script uses the Hugin CMake modules to find required -## image file format libraries, so it needs to know the name -## of the Hign source tree root. By default that must be -## "../hugin" relative to the libpano root(that contains -## this file). But you can set HUGIN_BASE_DIR to the path -## name of the Hugin root on the CMake command line. -## -## The parent directory of the Hugin root is one place where -## dependencies will be looked for. On Windows that should -## be the root directory of the Hugin SDK, and the wxWidgets -## package will likely supply the dependencies. Note: you -## may need to edit the wxWidgets version number below. -## - - -# requires at least cmake 2.6, now -cmake_minimum_required(VERSION 2.6) - -## Locate the hugin source root and its parent directory -IF(HUGIN_BASE_DIR) - GET_FILENAME_COMPONENT(SOURCE_BASE_DIR ${HUGIN_BASE_DIR} PATH CACHE) - set(CMAKE_MODULE_PATH ${HUGIN_BASE_DIR}/CMakeModules) -ELSE(HUGIN_BASE_DIR) - GET_FILENAME_COMPONENT(SOURCE_BASE_DIR ${CMAKE_SOURCE_DIR} PATH CACHE) - set(CMAKE_MODULE_PATH ${SOURCE_BASE_DIR}/hugin/CMakeModules) -ENDIF(HUGIN_BASE_DIR) - -if(WIN32) - ## load the Hugin cmake modules - include(HuginMacros) -endif() -include(CheckIncludeFiles) - -## global setup -project(libpano13) - -## -## wxWidgets -## -# This must come before FINDs for tiff, jpeg, png, zlib to enable -# finding the wxWidgets distributions of those packages on Windows. -IF(WIN32) - SET(wxWidgets_ROOT_DIR ${SOURCE_BASE_DIR}/wxWidgets-2.8.10) - ADD_DEFINITIONS(-D__Win__) - FIND_PACKAGE(wxWidgets REQUIRED) -ENDIF(WIN32) - - -## -## Graphics libraries -## -# wxWidgets sub-packages will be used if native ones aren't found - -FIND_PACKAGE(TIFF REQUIRED) -INCLUDE_DIRECTORIES(${TIFF_INCLUDE_DIR}) -FIND_PACKAGE(JPEG REQUIRED) -INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR}) -FIND_PACKAGE(PNG REQUIRED) -INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR}) -INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR}) +## cmakelists.txt for libpano13 in a Hugin build environment. +## 03-04 Aug 2009 TKSharpless +## +## Builds libpano13 only, by default without support for the +## Java programs ptpicker and pteditor. To include that, you +## can define HAVE_JAVA on the CMake command line. The Java +## header jni.h and its dependencies must then be in your +## include search path(this script does not find them). +## +## This script uses the Hugin CMake modules to find required +## image file format libraries, so it needs to know the name +## of the Hign source tree root. By default that must be +## "../hugin" relative to the libpano root(that contains +## this file). But you can set HUGIN_BASE_DIR to the path +## name of the Hugin root on the CMake command line. +## +## The parent directory of the Hugin root is one place where +## dependencies will be looked for. On Windows that should +## be the root directory of the Hugin SDK, and the wxWidgets +## package will likely supply the dependencies. Note: you +## may need to edit the wxWidgets version number below. +## + +# requires at least cmake 2.6, now +cmake_minimum_required(VERSION 2.6) + +## Locate the hugin source root and its parent directory +IF(HUGIN_BASE_DIR) + GET_FILENAME_COMPONENT(SOURCE_BASE_DIR ${HUGIN_BASE_DIR} PATH CACHE) + set(CMAKE_MODULE_PATH ${HUGIN_BASE_DIR}/CMakeModules) +ELSE(HUGIN_BASE_DIR) + GET_FILENAME_COMPONENT(SOURCE_BASE_DIR ${CMAKE_SOURCE_DIR} PATH CACHE) + set(CMAKE_MODULE_PATH ${SOURCE_BASE_DIR}/hugin/CMakeModules) +ENDIF(HUGIN_BASE_DIR) + +if(WIN32) + ## load the Hugin cmake modules + include(HuginMacros) +endif() +include(CheckIncludeFiles) + +## global setup +project(libpano13) + +## +## wxWidgets +## +# This must come before FINDs for tiff, jpeg, png, zlib to enable +# finding the wxWidgets distributions of those packages on Windows. +IF(WIN32) + SET(wxWidgets_ROOT_DIR ${SOURCE_BASE_DIR}/wxWidgets-2.8.10) + ADD_DEFINITIONS(-D__Win__) + FIND_PACKAGE(wxWidgets REQUIRED) +ENDIF(WIN32) + + +## +## Graphics libraries +## +# wxWidgets sub-packages will be used if native ones aren't found + +FIND_PACKAGE(TIFF REQUIRED) +INCLUDE_DIRECTORIES(${TIFF_INCLUDE_DIR}) +FIND_PACKAGE(JPEG REQUIRED) +INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR}) +FIND_PACKAGE(PNG REQUIRED) +INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR}) +INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR}) + set(_common_libs ${TIFF_LIBRARIES} ${ZLIB_LIBRARIES} ${JPEG_LIBRARIES} ${PNG_LIBRARIES}) -# -# Check build type and set options accordingly -# -IF(NOT CMAKE_BUILD_TYPE) - SET(CMAKE_BUILD_TYPE Release CACHE STRING - "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." - FORCE) -ENDIF(NOT CMAKE_BUILD_TYPE) -IF(${CMAKE_BUILD_TYPE} STREQUAL "Debug") - ADD_DEFINITIONS(-DDEBUG) - IF(UNIX) - ADD_DEFINITIONS(-Wall) - ENDIF(UNIX) -ENDIF(${CMAKE_BUILD_TYPE} STREQUAL "Debug") - -IF(UNIX) - ADD_DEFINITIONS(-D__Ansi__) -ELSE(UNIX) - IF(MSVC) - # Stop MSVC8 from bitching about the C library - ADD_DEFINITIONS(/D_CRT_SECURE_NO_DEPRECATE) - # Stop MSVC9 from bitching about possibly invalid STL usage - ADD_DEFINITIONS(/D_SCL_SECURE_NO_WARNINGS) - # Stop MSVC9 from bitching about POSIX names without underscores - ADD_DEFINITIONS(/D_CRT_NONSTDC_NO_DEPRECATE) - # compile everything for the static C runtime - FOREACH(TYPE C CXX) - # makefiles use blank configuration - FOREACH(CFG "_DEBUG" "_MINSIZEREL" "_RELEASE" "_RELWITHDEBINFO") - #MESSAGE("Replacing CMAKE_${TYPE}_FLAGS${CFG}: ${CMAKE_${TYPE}_FLAGS${CFG}}") - SET(NEW_FLAGS "${CMAKE_${TYPE}_FLAGS${CFG}}") - # fix up static libc flags - STRING(REPLACE "/MD" "/MT" NEW_FLAGS "${NEW_FLAGS}") - # *FORCE* to override whats already placed into the cache - SET(CMAKE_${TYPE}_FLAGS${CFG} "${NEW_FLAGS}" CACHE STRING - "CMAKE_${TYPE}_FLAGS${CFG} (overwritten to ensure static build)" FORCE) - #MESSAGE("New CMAKE_${TYPE}_FLAGS${CFG}: ${CMAKE_${TYPE}_FLAGS${CFG}}") - ENDFOREACH(CFG) - ENDFOREACH(TYPE) - # link only with the static C runtime !! THIS IS A MUST !! - SET(NEW_FLAGS "${CMAKE_EXE_LINKER_FLAGS}") - # ensure that the flags are not duplicaated on subsequent runs - STRING(REPLACE " /NODEFAULTLIB:\"MSVCRT.lib\" /NODEFAULTLIB:\"MSVCRTd.lib\"" "" NEW_FLAGS "${NEW_FLAGS}") - # note that flag names(NODEFAULTLIB) etc.) are case sensitive - SET(CMAKE_EXE_LINKER_FLAGS - "${NEW_FLAGS} /NODEFAULTLIB:\"MSVCRT.lib\" /NODEFAULTLIB:\"MSVCRTd.lib\"" - CACHE STRING "for MSVC" FORCE -) - ENDIF(MSVC) -ENDIF(UNIX) - -## -## Here is the part that builds libpano -## -if(HAVE_JAVA) - set(java_h pteditor.h ptutils.h) - set(java_c ptpicker.c pteditor.c) -else() - set(java_c javastub.c) -endif(HAVE_JAVA) - -set(pano13_install_hdr - panorama.h - filter.h - version.h - panotypes.h - PTcommon.h - pt_stdint.h - file.h - queryfeature.h - pteditor.h - ptutils.h) - -set(pano13_hdr - ${java_h} - ${pano13_install_hdr} - ColourBrightness.h - f2c.h - fftn.h - rgbe.h - sys_ansi.h - sys_win.h - ZComb.h -) - -set(pano13_res - pano13.rc - pano13vc.def -) - -set(pano13_src - ${java_c} - ${win_c} - adjust.c - bmp.c - ColourBrightness.c - correct.c - fftn.c - file.c - filter.c - fourier.c - hdrfile.c - jpeg.c - jpegicc.c - lmdif.c - math.c - metadata.c - morpher.c - multilayer.c - optimize.c - pan.c - parser.c - perspect.c - png.c - ppm.c - PTcommon.c - PTDialogs.c - ptfeather.c - ptstitch.c - queryfeature.c - remap.c - resample.c - rgbe.c - seamer.c - sys_ansi.c - sys_common.c - tiff.c - Triangulate.c - ZComb.c +# +# Check build type and set options accordingly +# +IF(NOT CMAKE_BUILD_TYPE) + SET(CMAKE_BUILD_TYPE Release CACHE STRING + "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel." + FORCE) +ENDIF(NOT CMAKE_BUILD_TYPE) +IF(${CMAKE_BUILD_TYPE} STREQUAL "Debug") + ADD_DEFINITIONS(-DDEBUG) + IF(UNIX) + ADD_DEFINITIONS(-Wall) + ENDIF(UNIX) +ENDIF(${CMAKE_BUILD_TYPE} STREQUAL "Debug") + +IF(UNIX) + ADD_DEFINITIONS(-D__Ansi__) +ELSE(UNIX) + IF(MSVC) + # Stop MSVC8 from bitching about the C library + ADD_DEFINITIONS(/D_CRT_SECURE_NO_DEPRECATE) + # Stop MSVC9 from bitching about possibly invalid STL usage + ADD_DEFINITIONS(/D_SCL_SECURE_NO_WARNINGS) + # Stop MSVC9 from bitching about POSIX names without underscores + ADD_DEFINITIONS(/D_CRT_NONSTDC_NO_DEPRECATE) + # compile everything for the static C runtime + FOREACH(TYPE C CXX) + # makefiles use blank configuration + FOREACH(CFG "_DEBUG" "_MINSIZEREL" "_RELEASE" "_RELWITHDEBINFO") + #MESSAGE("Replacing CMAKE_${TYPE}_FLAGS${CFG}: ${CMAKE_${TYPE}_FLAGS${CFG}}") + SET(NEW_FLAGS "${CMAKE_${TYPE}_FLAGS${CFG}}") + # fix up static libc flags + STRING(REPLACE "/MD" "/MT" NEW_FLAGS "${NEW_FLAGS}") + # *FORCE* to override whats already placed into the cache + SET(CMAKE_${TYPE}_FLAGS${CFG} "${NEW_FLAGS}" CACHE STRING + "CMAKE_${TYPE}_FLAGS${CFG} (overwritten to ensure static build)" FORCE) + #MESSAGE("New CMAKE_${TYPE}_FLAGS${CFG}: ${CMAKE_${TYPE}_FLAGS${CFG}}") + ENDFOREACH(CFG) + ENDFOREACH(TYPE) + # link only with the static C runtime !! THIS IS A MUST !! + SET(NEW_FLAGS "${CMAKE_EXE_LINKER_FLAGS}") + # ensure that the flags are not duplicaated on subsequent runs + STRING(REPLACE " /NODEFAULTLIB:\"MSVCRT.lib\" /NODEFAULTLIB:\"MSVCRTd.lib\"" "" NEW_FLAGS "${NEW_FLAGS}") + # note that flag names(NODEFAULTLIB) etc.) are case sensitive + SET(CMAKE_EXE_LINKER_FLAGS + "${NEW_FLAGS} /NODEFAULTLIB:\"MSVCRT.lib\" /NODEFAULTLIB:\"MSVCRTd.lib\"" + CACHE STRING "for MSVC" FORCE ) + ENDIF(MSVC) +ENDIF(UNIX) + +## +## Here is the part that builds libpano +## +if(HAVE_JAVA) + set(java_h pteditor.h ptutils.h) + set(java_c ptpicker.c pteditor.c) +else() + set(java_c javastub.c) +endif(HAVE_JAVA) + +set(pano13_install_hdr + panorama.h + filter.h + version.h + panotypes.h + PTcommon.h + pt_stdint.h + file.h + queryfeature.h + pteditor.h + ptutils.h) + +set(pano13_hdr + ${java_h} + ${pano13_install_hdr} + ColourBrightness.h + f2c.h + fftn.h + rgbe.h + sys_ansi.h + sys_win.h + ZComb.h +) + +set(pano13_res + pano13.rc + pano13vc.def +) + +set(pano13_src + ${java_c} + ${win_c} + adjust.c + bmp.c + ColourBrightness.c + correct.c + fftn.c + file.c + filter.c + fourier.c + hdrfile.c + jpeg.c + jpegicc.c + lmdif.c + math.c + metadata.c + morpher.c + multilayer.c + optimize.c + pan.c + parser.c + perspect.c + png.c + ppm.c + PTcommon.c + PTDialogs.c + ptfeather.c + ptstitch.c + queryfeature.c + remap.c + resample.c + rgbe.c + seamer.c + sys_ansi.c + sys_common.c + tiff.c + Triangulate.c + ZComb.c +) # We have some header files at top source level now include_directories(${CMAKE_SOURCE_DIR}) -add_library(pano13 SHARED ${pano13_hdr} ${pano13_res} ${pano13_src}) -add_library(pano13a STATIC ${pano13_hdr} ${pano13_res} ${pano13_src}) -set_target_properties(pano13 PROPERTIES VERSION "2.0.0" SOVERSION "2") -set_target_properties(pano13a PROPERTIES OUTPUT_NAME pano13) - -install(TARGETS pano13 pano13a - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib) - -install(FILES ${pano13_install_hdr} DESTINATION "include/pano13") - -set(TOP_SRC_DIR ${CMAKE_SOURCE_DIR}) - -add_subdirectory(man) -add_dependencies(pano13 man) -add_subdirectory(tools) -add_dependencies(tools pano13) - -macro(setstripped _varname _value) - string(STRIP ${_value} _v) - if(USE_POSIX_PACKAGING) - string(TOLOWER ${_v} ${_varname}) - else() - set(${_varname} ${_v}) - endif() -endmacro(setstripped) - -file(STRINGS "${TOP_SRC_DIR}/configure.ac" _config_lines) -foreach(_c_l ${_config_lines}) - if(_c_l MATCHES "^AC_INIT\\(\\[\([^,]+\)\\], *\\[\([^,]+\)\\], *\([^,]+\)") - setstripped(PACKAGE_BASE ${CMAKE_MATCH_1}) - setstripped(PACKAGE_VERSION ${CMAKE_MATCH_2}) - setstripped(PACKAGE_BUGREPORT ${CMAKE_MATCH_3}) - if(PACKAGE_VERSION MATCHES "^\([0-9]+\)\\.\([0-9]+\)\\.\([0-9]+\).*$") - message(STATUS "found version = ${PACKAGE_VERSION}") - set(PANO_MAJOR_VERSION ${CMAKE_MATCH_1}) - set(PANO_MINOR_VERSION ${CMAKE_MATCH_2}) - set(PANO_PATCH_VERSION ${CMAKE_MATCH_3}) - endif() - endif() -endforeach(_c_l) - -# set some variables which are used in libpano13.pc.in -set(prefix ${CMAKE_INSTALL_PREFIX}) -set(exec_prefix ${CMAKE_INSTALL_PREFIX}) -set(libdir ${CMAKE_INSTALL_PREFIX}/lib) -set(includedir ${CMAKE_INSTALL_PREFIX}/include) -set(LIB_JPEG ${JPEG_LIBRARY}) -set(LIB_TIFF ${TIFF_LIBRARY}) -set(LIB_ZLIB ${ZLIB_LIBRARY}) -set(LIB_PNG ${PNG_LIBRARY}) -set(VERSION ${PACKAGE_VERSION}) - -configure_file("${TOP_SRC_DIR}/libpano13.pc.in" "${CMAKE_BINARY_DIR}/libpano13.pc" @ONLY) - -install(FILES "${CMAKE_BINARY_DIR}/libpano13.pc" DESTINATION "lib/pkgconfig") - -set(CPACK_PACKAGE_VERSION_MAJOR "${PANO_MAJOR_VERSION}") -set(CPACK_PACKAGE_VERSION_MINOR "${PANO_MINOR_VERSION}") -set(CPACK_PACKAGE_VERSION_PATCH "${PANO_PATCH_VERSION}") - -# needed by rpm -set(CPACK_SET_DESTDIR "ON") - -# the next ones are needed by deb -set(CPACK_PACKAGE_CONTACT "${PACKAGE_BUGREPORT}") -set(CPACK_SOURCE_PACKAGE_FILE_NAME "libpano13") -set(CPACK_PACKAGE_DESCRIPTION_FILE "${TOP_SRC_DIR}/README") -set(CPACK_RESOURCE_FILE_LICENSE "${TOP_SRC_DIR}/gpl.txt") - -# Find the revision number and use it as the release in rpm-package-build. -# This way we may omit the otherwise needed "--force" parameter when -# installing from that rpm package. -# ... Disabled for the moment, because configure.ac supplies a value -find_program(_svnversion svnversion) -message(STATUS "svnversion = ${_svnversion}") -if(NOT ${_svnversion} MATCHES "-NOTFOUND") - execute_process(COMMAND ${_svnversion} WORKING_DIRECTORY "${TOP_SRC_DIR}" OUTPUT_VARIABLE CPACK_RPM_PACKAGE_RELEASE OUTPUT_STRIP_TRAILING_WHITESPACE) - # We use this value also to set the package-patch-value - if(CPACK_RPM_PACKAGE_RELEASE MATCHES "^\([0-9]+\)") - #set(CPACK_PACKAGE_VERSION_PATCH ${CMAKE_MATCH_1}) - endif() -endif() - -include(CPack) - - -enable_testing() -add_subdirectory(tests) +add_library(pano13 SHARED ${pano13_hdr} ${pano13_res} ${pano13_src}) +add_library(pano13a STATIC ${pano13_hdr} ${pano13_res} ${pano13_src}) +set_target_properties(pano13 PROPERTIES VERSION "2.0.0" SOVERSION "2") +set_target_properties(pano13a PROPERTIES OUTPUT_NAME pano13) + +install(TARGETS pano13 pano13a + LIBRARY DESTINATION lib + ARCHIVE DESTINATION lib) + +install(FILES ${pano13_install_hdr} DESTINATION "include/pano13") + +set(TOP_SRC_DIR ${CMAKE_SOURCE_DIR}) + +add_subdirectory(man) +add_dependencies(pano13 man) +add_subdirectory(tools) +add_dependencies(tools pano13) + +macro(setstripped _varname _value) + string(STRIP ${_value} _v) + if(USE_POSIX_PACKAGING) + string(TOLOWER ${_v} ${_varname}) + else() + set(${_varname} ${_v}) + endif() +endmacro(setstripped) + +file(STRINGS "${TOP_SRC_DIR}/configure.ac" _config_lines) +foreach(_c_l ${_config_lines}) + if(_c_l MATCHES "^AC_INIT\\(\\[\([^,]+\)\\], *\\[\([^,]+\)\\], *\([^,]+\)") + setstripped(PACKAGE_BASE ${CMAKE_MATCH_1}) + setstripped(PACKAGE_VERSION ${CMAKE_MATCH_2}) + setstripped(PACKAGE_BUGREPORT ${CMAKE_MATCH_3}) + if(PACKAGE_VERSION MATCHES "^\([0-9]+\)\\.\([0-9]+\)\\.\([0-9]+\).*$") + message(STATUS "found version = ${PACKAGE_VERSION}") + set(PANO_MAJOR_VERSION ${CMAKE_MATCH_1}) + set(PANO_MINOR_VERSION ${CMAKE_MATCH_2}) + set(PANO_PATCH_VERSION ${CMAKE_MATCH_3}) + endif() + endif() +endforeach(_c_l) + +# set some variables which are used in libpano13.pc.in +set(prefix ${CMAKE_INSTALL_PREFIX}) +set(exec_prefix ${CMAKE_INSTALL_PREFIX}) +set(libdir ${CMAKE_INSTALL_PREFIX}/lib) +set(includedir ${CMAKE_INSTALL_PREFIX}/include) +set(LIB_JPEG ${JPEG_LIBRARY}) +set(LIB_TIFF ${TIFF_LIBRARY}) +set(LIB_ZLIB ${ZLIB_LIBRARY}) +set(LIB_PNG ${PNG_LIBRARY}) +set(VERSION ${PACKAGE_VERSION}) + +configure_file("${TOP_SRC_DIR}/libpano13.pc.in" "${CMAKE_BINARY_DIR}/libpano13.pc" @ONLY) + +install(FILES "${CMAKE_BINARY_DIR}/libpano13.pc" DESTINATION "lib/pkgconfig") + +set(CPACK_PACKAGE_VERSION_MAJOR "${PANO_MAJOR_VERSION}") +set(CPACK_PACKAGE_VERSION_MINOR "${PANO_MINOR_VERSION}") +set(CPACK_PACKAGE_VERSION_PATCH "${PANO_PATCH_VERSION}") + +# needed by rpm +set(CPACK_SET_DESTDIR "ON") + +# the next ones are needed by deb +set(CPACK_PACKAGE_CONTACT "${PACKAGE_BUGREPORT}") +set(CPACK_SOURCE_PACKAGE_FILE_NAME "libpano13") +set(CPACK_PACKAGE_DESCRIPTION_FILE "${TOP_SRC_DIR}/README") +set(CPACK_RESOURCE_FILE_LICENSE "${TOP_SRC_DIR}/gpl.txt") + +# Find the revision number and use it as the release in rpm-package-build. +# This way we may omit the otherwise needed "--force" parameter when +# installing from that rpm package. +# ... Disabled for the moment, because configure.ac supplies a value +find_program(_svnversion svnversion) +message(STATUS "svnversion = ${_svnversion}") +if(NOT ${_svnversion} MATCHES "-NOTFOUND") + execute_process(COMMAND ${_svnversion} WORKING_DIRECTORY "${TOP_SRC_DIR}" OUTPUT_VARIABLE CPACK_RPM_PACKAGE_RELEASE OUTPUT_STRIP_TRAILING_WHITESPACE) + # We use this value also to set the package-patch-value + if(CPACK_RPM_PACKAGE_RELEASE MATCHES "^\([0-9]+\)") + #set(CPACK_PACKAGE_VERSION_PATCH ${CMAKE_MATCH_1}) + endif() +endif() + +include(CPack) + + +enable_testing() +add_subdirectory(tests) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: Kornel B. <Kor...@be...> - 2009-09-27 09:40:10
|
Am Sonntag 27 September 2009 schrieb bru...@us...: > Revision: 1085 > http://panotools.svn.sourceforge.net/panotools/?rev=1085&view=rev > Author: brunopostle > Date: 2009-09-27 09:30:50 +0000 (Sun, 27 Sep 2009) > > Log Message: > ----------- > Unify mixed line endings > > Modified Paths: > -------------- > trunk/libpano/CMakeLists.txt > > Modified: trunk/libpano/CMakeLists.txt Thanks Bruno, I was already wondering, who brought back theese _crlf_. Kornel -- Kornel Benko Kor...@be... |
From: <kor...@us...> - 2009-09-27 20:52:08
|
Revision: 1089 http://panotools.svn.sourceforge.net/panotools/?rev=1089&view=rev Author: kornelbenko Date: 2009-09-27 20:51:56 +0000 (Sun, 27 Sep 2009) Log Message: ----------- For now don't try to install a dll on windows due to some link errors. Modified Paths: -------------- trunk/libpano/CMakeLists.txt Modified: trunk/libpano/CMakeLists.txt =================================================================== --- trunk/libpano/CMakeLists.txt 2009-09-27 11:57:32 UTC (rev 1088) +++ trunk/libpano/CMakeLists.txt 2009-09-27 20:51:56 UTC (rev 1089) @@ -202,16 +202,20 @@ ) # We have some header files at top source level now include_directories(${CMAKE_SOURCE_DIR}) -add_library(pano13 SHARED ${pano13_hdr} ${pano13_res} ${pano13_src}) -target_link_libraries(pano13 ${_common_libs}) + +if(NOT WIN32) + # Create and install shared library on non-windows + add_library(pano13 SHARED ${pano13_hdr} ${pano13_res} ${pano13_src}) + target_link_libraries(pano13 ${_common_libs}) + set_target_properties(pano13 PROPERTIES VERSION "2.0.0" SOVERSION "2") + install(TARGETS pano13 LIBRARY DESTINATION lib) +endif() + +#create and install static library add_library(pano13a STATIC ${pano13_hdr} ${pano13_res} ${pano13_src}) -set_target_properties(pano13 PROPERTIES VERSION "2.0.0" SOVERSION "2") set_target_properties(pano13a PROPERTIES OUTPUT_NAME pano13) +install(TARGETS pano13a ARCHIVE DESTINATION lib) -install(TARGETS pano13 pano13a - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib) - install(FILES ${pano13_install_hdr} DESTINATION "include/pano13") set(TOP_SRC_DIR ${CMAKE_SOURCE_DIR}) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kor...@us...> - 2009-09-28 05:13:32
|
Revision: 1091 http://panotools.svn.sourceforge.net/panotools/?rev=1091&view=rev Author: kornelbenko Date: 2009-09-28 05:13:17 +0000 (Mon, 28 Sep 2009) Log Message: ----------- Remove the use of HuginMacros on windows. Apparently not needed. Modified Paths: -------------- trunk/libpano/CMakeLists.txt Modified: trunk/libpano/CMakeLists.txt =================================================================== --- trunk/libpano/CMakeLists.txt 2009-09-28 02:42:48 UTC (rev 1090) +++ trunk/libpano/CMakeLists.txt 2009-09-28 05:13:17 UTC (rev 1091) @@ -34,10 +34,6 @@ set(CMAKE_MODULE_PATH ${SOURCE_BASE_DIR}/hugin/CMakeModules) ENDIF(HUGIN_BASE_DIR) -if(WIN32) - ## load the Hugin cmake modules - include(HuginMacros) -endif() include(CheckIncludeFiles) ## global setup This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kor...@us...> - 2009-09-28 06:40:25
|
Revision: 1092 http://panotools.svn.sourceforge.net/panotools/?rev=1092&view=rev Author: kornelbenko Date: 2009-09-28 06:40:16 +0000 (Mon, 28 Sep 2009) Log Message: ----------- Added version to created source package Modified Paths: -------------- trunk/libpano/CMakeLists.txt Modified: trunk/libpano/CMakeLists.txt =================================================================== --- trunk/libpano/CMakeLists.txt 2009-09-28 05:13:17 UTC (rev 1091) +++ trunk/libpano/CMakeLists.txt 2009-09-28 06:40:16 UTC (rev 1092) @@ -287,6 +287,8 @@ endif() endif() +set(CPACK_SOURCE_PACKAGE_FILE_NAME "libpano13-${PACKAGE_VERSION}") + include(CPack) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kor...@us...> - 2009-10-23 11:54:07
|
Revision: 1114 http://panotools.svn.sourceforge.net/panotools/?rev=1114&view=rev Author: kornelbenko Date: 2009-10-23 11:53:54 +0000 (Fri, 23 Oct 2009) Log Message: ----------- For WINN32: Added tools/compat_win32/getopt.c to variable win_c. getopt.o is now part of libpano13. Needed by tools. Modified Paths: -------------- trunk/libpano/CMakeLists.txt Modified: trunk/libpano/CMakeLists.txt =================================================================== --- trunk/libpano/CMakeLists.txt 2009-10-17 22:37:52 UTC (rev 1113) +++ trunk/libpano/CMakeLists.txt 2009-10-23 11:53:54 UTC (rev 1114) @@ -48,6 +48,7 @@ SET(wxWidgets_ROOT_DIR ${SOURCE_BASE_DIR}/wxWidgets-2.8.10) ADD_DEFINITIONS(-D__Win__) FIND_PACKAGE(wxWidgets REQUIRED) + set(win_c "tools/compat_win32/getopt.c") ENDIF(WIN32) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tks...@us...> - 2010-01-16 15:27:08
|
Revision: 1228 http://panotools.svn.sourceforge.net/panotools/?rev=1228&view=rev Author: tksharpless Date: 2010-01-16 15:27:01 +0000 (Sat, 16 Jan 2010) Log Message: ----------- Make the default install directory on Windows libpano13/ in the hugin SDK root Modified Paths: -------------- trunk/libpano/CMakeLists.txt Modified: trunk/libpano/CMakeLists.txt =================================================================== --- trunk/libpano/CMakeLists.txt 2010-01-16 14:15:08 UTC (rev 1227) +++ trunk/libpano/CMakeLists.txt 2010-01-16 15:27:01 UTC (rev 1228) @@ -1,9 +1,17 @@ ## cmakelists.txt for libpano13 in a Hugin build environment. ## 03-04 Aug 2009 TKSharpless +## Updated 16 Jan 2010 to add general Pannini projection ## -## Builds libpano13 only, by default without support for the -## Java programs ptpicker and pteditor. To include that, you -## can define HAVE_JAVA on the CMake command line. The Java +## For Windows, download just part of the panotools SVN tree: +## https://panotools.svn.sourceforge.net/svnroot/panotools/trunk/libpano +## into local directory libpano under the hugin SDK root. +## Then build in-place with CMake, and build INSTALL. That +## will create a directory in the SDK root that the hugin +## CMake build scripts can use. +## +## Builds libpano13 and selected panotools, by default without +## support for the Java programs ptpicker and pteditor. You +## can define HAVE_JAVA on the CMake command line; the Java ## header jni.h and its dependencies must then be in your ## include search path(this script does not find them). ## @@ -34,6 +42,10 @@ set(CMAKE_MODULE_PATH ${SOURCE_BASE_DIR}/hugin/CMakeModules) ENDIF(HUGIN_BASE_DIR) +IF(WIN32) + set(CMAKE_INSTALL_PREFIX "${SOURCE_BASE_DIR}/libpano13" CACHE PATH "Install prefix for hugin SDK") +ENDIF(WIN32) + include(CheckIncludeFiles) ## global setup This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tks...@us...> - 2010-01-16 16:09:52
|
Revision: 1229 http://panotools.svn.sourceforge.net/panotools/?rev=1229&view=rev Author: tksharpless Date: 2010-01-16 16:09:46 +0000 (Sat, 16 Jan 2010) Log Message: ----------- Install documentation expected by hugin Windows install script Modified Paths: -------------- trunk/libpano/CMakeLists.txt Modified: trunk/libpano/CMakeLists.txt =================================================================== --- trunk/libpano/CMakeLists.txt 2010-01-16 15:27:01 UTC (rev 1228) +++ trunk/libpano/CMakeLists.txt 2010-01-16 16:09:46 UTC (rev 1229) @@ -232,6 +232,25 @@ install(FILES ${pano13_install_hdr} DESTINATION "include/pano13") +# install documentation expected by hugin install script +INSTALL( + FILES + AUTHORS + gpl.txt + LICENSE.LGPL + README + TODO + DESTINATION "include/pano13" + ) +INSTALL( + FILES + doc/Optimize.txt + doc/PTblender.readme + doc/PTmender.readme + doc/stitch.txt + DESTINATION "include/pano13/doc" + ) + set(TOP_SRC_DIR ${CMAKE_SOURCE_DIR}) add_subdirectory(man) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kor...@us...> - 2010-01-18 05:53:55
|
Revision: 1235 http://panotools.svn.sourceforge.net/panotools/?rev=1235&view=rev Author: kornelbenko Date: 2010-01-18 05:53:48 +0000 (Mon, 18 Jan 2010) Log Message: ----------- Removed LICENSE.LGPL form CMakeLists.txt Modified Paths: -------------- trunk/libpano/CMakeLists.txt Modified: trunk/libpano/CMakeLists.txt =================================================================== --- trunk/libpano/CMakeLists.txt 2010-01-18 02:14:32 UTC (rev 1234) +++ trunk/libpano/CMakeLists.txt 2010-01-18 05:53:48 UTC (rev 1235) @@ -237,7 +237,6 @@ FILES AUTHORS gpl.txt - LICENSE.LGPL README TODO DESTINATION "include/pano13" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kor...@us...> - 2010-04-11 10:46:55
|
Revision: 1268 http://panotools.svn.sourceforge.net/panotools/?rev=1268&view=rev Author: kornelbenko Date: 2010-04-11 10:46:49 +0000 (Sun, 11 Apr 2010) Log Message: ----------- Cannot install non-existant file Modified Paths: -------------- trunk/libpano/CMakeLists.txt Modified: trunk/libpano/CMakeLists.txt =================================================================== --- trunk/libpano/CMakeLists.txt 2010-04-10 21:29:11 UTC (rev 1267) +++ trunk/libpano/CMakeLists.txt 2010-04-11 10:46:49 UTC (rev 1268) @@ -238,7 +238,6 @@ AUTHORS gpl.txt README - TODO DESTINATION "include/pano13" ) INSTALL( This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |