From: <tks...@us...> - 2008-01-28 20:59:17
|
Revision: 2718 http://hugin.svn.sourceforge.net/hugin/?rev=2718&view=rev Author: tksharpless Date: 2008-01-28 12:59:13 -0800 (Mon, 28 Jan 2008) Log Message: ----------- changed root cmakelists.txt so it works on Windows with the sdk; tried not to break Linux build but this is not verified. Modified Paths: -------------- autopano-sift-C/trunk/CMakeLists.txt Modified: autopano-sift-C/trunk/CMakeLists.txt =================================================================== --- autopano-sift-C/trunk/CMakeLists.txt 2008-01-28 10:35:00 UTC (rev 2717) +++ autopano-sift-C/trunk/CMakeLists.txt 2008-01-28 20:59:13 UTC (rev 2718) @@ -43,11 +43,18 @@ ## ## XML library ## +IF( WIN32 ) +# SDK builds use the standard libxml package + FIND_PACKAGE(LIBXML2 REQUIRED) + ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) + INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) +ELSE (WIN32) +# Linux builds apparently need a customized libxml + FIND_PACKAGE(LIBXML2MY REQUIRED) + ADD_DEFINITIONS(${LIBXML2MY_DEFINITIONS}) + INCLUDE_DIRECTORIES(${LIBXML2MY_INCLUDE_DIR}) +ENDIF (WIN32) -FIND_PACKAGE(LIBXML2MY REQUIRED) -ADD_DEFINITIONS(${LIBXML2MY_DEFINITIONS}) -INCLUDE_DIRECTORIES(${LIBXML2MY_INCLUDE_DIR}) - ## ## Panotools ## @@ -65,6 +72,7 @@ IF(UNIX) ADD_DEFINITIONS(-Wall) + ADD_DEFINITIONS(-dHAS_PANO13) ENDIF(UNIX) # Setup MSVC @@ -88,6 +96,10 @@ # compile as C code as C++ code, required to enable # variable declarations between statements. ADD_DEFINITIONS(/TP) + + # yes we DO have pano13 + ADD_DEFINITIONS( /DHAS_PANO13 ) + ENDIF(MSVC) # create config.h file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tks...@us...> - 2008-01-29 04:08:00
|
Revision: 2722 http://hugin.svn.sourceforge.net/hugin/?rev=2722&view=rev Author: tksharpless Date: 2008-01-28 20:07:55 -0800 (Mon, 28 Jan 2008) Log Message: ----------- fixed bad Unix compiler flag from previous fix (my fault) Modified Paths: -------------- autopano-sift-C/trunk/CMakeLists.txt Modified: autopano-sift-C/trunk/CMakeLists.txt =================================================================== --- autopano-sift-C/trunk/CMakeLists.txt 2008-01-28 23:42:13 UTC (rev 2721) +++ autopano-sift-C/trunk/CMakeLists.txt 2008-01-29 04:07:55 UTC (rev 2722) @@ -72,7 +72,7 @@ IF(UNIX) ADD_DEFINITIONS(-Wall) - ADD_DEFINITIONS(-dHAS_PANO13) + ADD_DEFINITIONS(-DHAS_PANO13) ENDIF(UNIX) # Setup MSVC This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <da...@us...> - 2008-01-29 08:08:33
|
Revision: 2724 http://hugin.svn.sourceforge.net/hugin/?rev=2724&view=rev Author: dangelo Date: 2008-01-29 00:08:31 -0800 (Tue, 29 Jan 2008) Log Message: ----------- remove MY prefix leftover from some testing. Modified Paths: -------------- autopano-sift-C/trunk/CMakeLists.txt Modified: autopano-sift-C/trunk/CMakeLists.txt =================================================================== --- autopano-sift-C/trunk/CMakeLists.txt 2008-01-29 08:06:12 UTC (rev 2723) +++ autopano-sift-C/trunk/CMakeLists.txt 2008-01-29 08:08:31 UTC (rev 2724) @@ -50,9 +50,9 @@ INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) ELSE (WIN32) # Linux builds apparently need a customized libxml - FIND_PACKAGE(LIBXML2MY REQUIRED) - ADD_DEFINITIONS(${LIBXML2MY_DEFINITIONS}) - INCLUDE_DIRECTORIES(${LIBXML2MY_INCLUDE_DIR}) + FIND_PACKAGE(LIBXML2 REQUIRED) + ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) + INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) ENDIF (WIN32) ## This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <da...@us...> - 2008-01-29 08:22:07
|
Revision: 2725 http://hugin.svn.sourceforge.net/hugin/?rev=2725&view=rev Author: dangelo Date: 2008-01-29 00:22:04 -0800 (Tue, 29 Jan 2008) Log Message: ----------- unified libxml config on windows and unix Modified Paths: -------------- autopano-sift-C/trunk/CMakeLists.txt Modified: autopano-sift-C/trunk/CMakeLists.txt =================================================================== --- autopano-sift-C/trunk/CMakeLists.txt 2008-01-29 08:08:31 UTC (rev 2724) +++ autopano-sift-C/trunk/CMakeLists.txt 2008-01-29 08:22:04 UTC (rev 2725) @@ -43,17 +43,9 @@ ## ## XML library ## -IF( WIN32 ) -# SDK builds use the standard libxml package - FIND_PACKAGE(LIBXML2 REQUIRED) - ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) - INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) -ELSE (WIN32) -# Linux builds apparently need a customized libxml - FIND_PACKAGE(LIBXML2 REQUIRED) - ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) - INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) -ENDIF (WIN32) +FIND_PACKAGE(LibXml2 REQUIRED) +ADD_DEFINITIONS(${LIBXML2_DEFINITIONS}) +INCLUDE_DIRECTORIES(${LIBXML2_INCLUDE_DIR}) ## ## Panotools @@ -106,7 +98,6 @@ configure_file(config.h.in.cmake ${CMAKE_BINARY_DIR}/config.h) INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}) - ## ## Finally, rules to build the source code! ## This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bru...@us...> - 2008-01-29 11:41:05
|
Revision: 2727 http://hugin.svn.sourceforge.net/hugin/?rev=2727&view=rev Author: brunopostle Date: 2008-01-29 03:40:59 -0800 (Tue, 29 Jan 2008) Log Message: ----------- Don't put the compiled binaries in the tarball Modified Paths: -------------- autopano-sift-C/trunk/CMakeLists.txt Modified: autopano-sift-C/trunk/CMakeLists.txt =================================================================== --- autopano-sift-C/trunk/CMakeLists.txt 2008-01-29 10:34:17 UTC (rev 2726) +++ autopano-sift-C/trunk/CMakeLists.txt 2008-01-29 11:40:59 UTC (rev 2727) @@ -154,6 +154,8 @@ SET(CPACK_SOURCE_PACKAGE_FILE_NAME "autopano-sift-C-${V_MAJOR}.${V_MINOR}.${V_PATCH}") SET(CPACK_SOURCE_GENERATOR "TGZ") SET(CPACK_SOURCE_IGNORE_FILES +"/autopano$" +"/generatekeys$" "/_CPack_Packages/" "/CMakeCache.txt$" "\\\\.dir/" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bru...@us...> - 2008-01-29 11:44:18
|
Revision: 2728 http://hugin.svn.sourceforge.net/hugin/?rev=2728&view=rev Author: brunopostle Date: 2008-01-29 03:44:14 -0800 (Tue, 29 Jan 2008) Log Message: ----------- Don't put a generated Makefile in the tarball Modified Paths: -------------- autopano-sift-C/trunk/CMakeLists.txt Modified: autopano-sift-C/trunk/CMakeLists.txt =================================================================== --- autopano-sift-C/trunk/CMakeLists.txt 2008-01-29 11:40:59 UTC (rev 2727) +++ autopano-sift-C/trunk/CMakeLists.txt 2008-01-29 11:44:14 UTC (rev 2728) @@ -156,6 +156,7 @@ SET(CPACK_SOURCE_IGNORE_FILES "/autopano$" "/generatekeys$" +"/Makefile$" "/_CPack_Packages/" "/CMakeCache.txt$" "\\\\.dir/" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bru...@us...> - 2008-01-29 12:20:11
|
Revision: 2730 http://hugin.svn.sourceforge.net/hugin/?rev=2730&view=rev Author: brunopostle Date: 2008-01-29 04:20:02 -0800 (Tue, 29 Jan 2008) Log Message: ----------- autopano-c-complete.sh needs to be installed executable Modified Paths: -------------- autopano-sift-C/trunk/CMakeLists.txt Modified: autopano-sift-C/trunk/CMakeLists.txt =================================================================== --- autopano-sift-C/trunk/CMakeLists.txt 2008-01-29 11:49:27 UTC (rev 2729) +++ autopano-sift-C/trunk/CMakeLists.txt 2008-01-29 12:20:02 UTC (rev 2730) @@ -119,7 +119,7 @@ TARGET_LINK_LIBRARIES(autopano ${all_libs}) install(TARGETS generatekeys autopano DESTINATION bin) -install(FILES autopano-c-complete.sh DESTINATION bin) +install(PROGRAMS autopano-c-complete.sh DESTINATION bin) # man pages FILE(GLOB MAN_PAGES_1 doc/*.1) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bru...@us...> - 2008-01-29 12:55:40
|
Revision: 2731 http://hugin.svn.sourceforge.net/hugin/?rev=2731&view=rev Author: brunopostle Date: 2008-01-29 04:55:30 -0800 (Tue, 29 Jan 2008) Log Message: ----------- Don't install duplicate man pages Modified Paths: -------------- autopano-sift-C/trunk/CMakeLists.txt Modified: autopano-sift-C/trunk/CMakeLists.txt =================================================================== --- autopano-sift-C/trunk/CMakeLists.txt 2008-01-29 12:20:02 UTC (rev 2730) +++ autopano-sift-C/trunk/CMakeLists.txt 2008-01-29 12:55:30 UTC (rev 2731) @@ -123,9 +123,7 @@ # man pages FILE(GLOB MAN_PAGES_1 doc/*.1) -FILE(GLOB MAN_PAGES_7 doc/*.1) install(FILES ${MAN_PAGES_1} DESTINATION share/man/man1) -install(FILES ${MAN_PAGES_7} DESTINATION share/man/man7) ## Test exectuables. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bru...@us...> - 2008-01-29 13:54:57
|
Revision: 2732 http://hugin.svn.sourceforge.net/hugin/?rev=2732&view=rev Author: brunopostle Date: 2008-01-29 05:54:52 -0800 (Tue, 29 Jan 2008) Log Message: ----------- Revert and fix previous commit Modified Paths: -------------- autopano-sift-C/trunk/CMakeLists.txt Modified: autopano-sift-C/trunk/CMakeLists.txt =================================================================== --- autopano-sift-C/trunk/CMakeLists.txt 2008-01-29 12:55:30 UTC (rev 2731) +++ autopano-sift-C/trunk/CMakeLists.txt 2008-01-29 13:54:52 UTC (rev 2732) @@ -123,7 +123,9 @@ # man pages FILE(GLOB MAN_PAGES_1 doc/*.1) +FILE(GLOB MAN_PAGES_7 doc/*.7) install(FILES ${MAN_PAGES_1} DESTINATION share/man/man1) +install(FILES ${MAN_PAGES_7} DESTINATION share/man/man7) ## Test exectuables. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yu...@us...> - 2008-02-03 20:39:58
|
Revision: 2780 http://hugin.svn.sourceforge.net/hugin/?rev=2780&view=rev Author: yuv Date: 2008-02-03 12:39:56 -0800 (Sun, 03 Feb 2008) Log Message: ----------- INSTALL target for Windows in build directory instead of "C:\Program Files", for SDK integration Modified Paths: -------------- autopano-sift-C/trunk/CMakeLists.txt Modified: autopano-sift-C/trunk/CMakeLists.txt =================================================================== --- autopano-sift-C/trunk/CMakeLists.txt 2008-02-03 20:32:52 UTC (rev 2779) +++ autopano-sift-C/trunk/CMakeLists.txt 2008-02-03 20:39:56 UTC (rev 2780) @@ -10,6 +10,9 @@ set(PACKAGE_VERSION ${V_MAJOR}.${V_MINOR}.${V_PATCH}) IF (WIN32) + # install into place in build-dir + SET( CMAKE_INSTALL_PREFIX ${CMAKE_CURRENT_BINARY_DIR}/INSTALL/FILES CACHE FILEPATH "install prefix" FORCE) + ## ## The directory that contains the hugin source root is a good ## place to look for support packages, so post it in cache. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tks...@us...> - 2008-02-05 02:13:04
|
Revision: 2791 http://hugin.svn.sourceforge.net/hugin/?rev=2791&view=rev Author: tksharpless Date: 2008-02-04 18:13:02 -0800 (Mon, 04 Feb 2008) Log Message: ----------- installs vbs script on Windows, else shell script. Modified Paths: -------------- autopano-sift-C/trunk/CMakeLists.txt Modified: autopano-sift-C/trunk/CMakeLists.txt =================================================================== --- autopano-sift-C/trunk/CMakeLists.txt 2008-02-05 02:00:17 UTC (rev 2790) +++ autopano-sift-C/trunk/CMakeLists.txt 2008-02-05 02:13:02 UTC (rev 2791) @@ -122,8 +122,13 @@ TARGET_LINK_LIBRARIES(autopano ${all_libs}) install(TARGETS generatekeys autopano DESTINATION bin) -install(PROGRAMS autopano-c-complete.sh DESTINATION bin) +if (WIN32) + install(PROGRAMS autopano-c-complete.vbs DESTINATION bin) +else (WIN32) + install(PROGRAMS autopano-c-complete.sh DESTINATION bin) +endif (WIN32) + # man pages FILE(GLOB MAN_PAGES_1 doc/*.1) FILE(GLOB MAN_PAGES_7 doc/*.7) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <da...@us...> - 2008-02-15 22:44:07
|
Revision: 2859 http://hugin.svn.sourceforge.net/hugin/?rev=2859&view=rev Author: dangelo Date: 2008-02-15 14:44:05 -0800 (Fri, 15 Feb 2008) Log Message: ----------- Renamed APSC to autopano-sift-c, to match the naming style of most other tools shipped with hugin. Modified Paths: -------------- autopano-sift-C/trunk/CMakeLists.txt Modified: autopano-sift-C/trunk/CMakeLists.txt =================================================================== --- autopano-sift-C/trunk/CMakeLists.txt 2008-02-15 22:28:50 UTC (rev 2858) +++ autopano-sift-C/trunk/CMakeLists.txt 2008-02-15 22:44:05 UTC (rev 2859) @@ -121,11 +121,11 @@ add_executable(autopano AutoPano.c) TARGET_LINK_LIBRARIES(autopano ${all_libs}) -add_executable(APSC APSCmain.c) -TARGET_LINK_LIBRARIES(APSC ${all_libs}) +add_executable(autopano-sift-c APSCmain.c) +TARGET_LINK_LIBRARIES(autopano-sift-c ${all_libs}) install(TARGETS generatekeys autopano DESTINATION bin) -install(TARGETS APSC DESTINATION bin) +install(TARGETS autopano-sift-c DESTINATION bin) if (WIN32) install(PROGRAMS autopano-c-complete.vbs DESTINATION bin) else (WIN32) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bru...@us...> - 2008-02-20 22:57:58
|
Revision: 2904 http://hugin.svn.sourceforge.net/hugin/?rev=2904&view=rev Author: brunopostle Date: 2008-02-20 14:57:55 -0800 (Wed, 20 Feb 2008) Log Message: ----------- Don't put compiled binary in tarball Modified Paths: -------------- autopano-sift-C/trunk/CMakeLists.txt Modified: autopano-sift-C/trunk/CMakeLists.txt =================================================================== --- autopano-sift-C/trunk/CMakeLists.txt 2008-02-20 17:47:32 UTC (rev 2903) +++ autopano-sift-C/trunk/CMakeLists.txt 2008-02-20 22:57:55 UTC (rev 2904) @@ -171,6 +171,7 @@ SET(CPACK_SOURCE_IGNORE_FILES "/autopano$" "/generatekeys$" +"/autopano-sift-c$" "/Makefile$" "/_CPack_Packages/" "/CMakeCache.txt$" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |