From: <yu...@us...> - 2009-09-16 11:45:04
|
Revision: 4432 http://hugin.svn.sourceforge.net/hugin/?rev=4432&view=rev Author: yuv Date: 2009-09-16 11:44:39 +0000 (Wed, 16 Sep 2009) Log Message: ----------- removed introduced CMake message to avoid aggravating the life of Windows builder Modified Paths: -------------- hugin/trunk/CMakeLists.txt Modified: hugin/trunk/CMakeLists.txt =================================================================== --- hugin/trunk/CMakeLists.txt 2009-09-15 20:16:44 UTC (rev 4431) +++ hugin/trunk/CMakeLists.txt 2009-09-16 11:44:39 UTC (rev 4432) @@ -72,7 +72,8 @@ include(CheckFunctionExists) set(CMAKE_REQUIRED_LIBRARIES -lm) check_function_exists(log2 HAVE_LOG2) -message("LOG2 ${HAVE_LOG2}") +# use messages only for debug - on Windows they are extremely intrusive +# message("LOG2 ${HAVE_LOG2}") # # find dependencies This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kor...@us...> - 2009-09-20 12:50:14
|
Revision: 4461 http://hugin.svn.sourceforge.net/hugin/?rev=4461&view=rev Author: kornelbenko Date: 2009-09-20 12:50:09 +0000 (Sun, 20 Sep 2009) Log Message: ----------- Added libpano dependency (for debian only). This means, installing hugin as package would be on debian possible only if there already is a libpano13 package installed. Modified Paths: -------------- hugin/trunk/CMakeLists.txt Modified: hugin/trunk/CMakeLists.txt =================================================================== --- hugin/trunk/CMakeLists.txt 2009-09-19 08:50:32 UTC (rev 4460) +++ hugin/trunk/CMakeLists.txt 2009-09-20 12:50:09 UTC (rev 4461) @@ -452,6 +452,7 @@ "\\\\.la$" "Makefile\\\\.in$" ) +set(CPACK_DEBIAN_PACKAGE_DEPENDS "libpano13 (>=2.9.15)") INCLUDE(CPack) ## This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bru...@us...> - 2009-09-30 22:27:06
|
Revision: 4526 http://hugin.svn.sourceforge.net/hugin/?rev=4526&view=rev Author: brunopostle Date: 2009-09-30 22:26:54 +0000 (Wed, 30 Sep 2009) Log Message: ----------- Rule to make more verbose SVN ChangeLog format Modified Paths: -------------- hugin/trunk/CMakeLists.txt Modified: hugin/trunk/CMakeLists.txt =================================================================== --- hugin/trunk/CMakeLists.txt 2009-09-30 22:20:43 UTC (rev 4525) +++ hugin/trunk/CMakeLists.txt 2009-09-30 22:26:54 UTC (rev 4526) @@ -75,6 +75,14 @@ # use messages only for debug - on Windows they are extremely intrusive # message("LOG2 ${HAVE_LOG2}") +IF (EXISTS ${PROJECT_SOURCE_DIR}/.svn) + IF (UPDATE_CHANGELOG) + EXECUTE_PROCESS(COMMAND "svn2cl" "--group-by-day" "--include-rev" "--linelen=78" + "--output=${PROJECT_SOURCE_DIR}/ChangeLog" "${PROJECT_SOURCE_DIR}" ) + ENDIF (UPDATE_CHANGELOG) +ENDIF (EXISTS ${PROJECT_SOURCE_DIR}/.svn) + + # # find dependencies # This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yu...@us...> - 2009-10-01 01:25:01
|
Revision: 4530 http://hugin.svn.sourceforge.net/hugin/?rev=4530&view=rev Author: yuv Date: 2009-10-01 01:24:47 +0000 (Thu, 01 Oct 2009) Log Message: ----------- bumping trunk's version number Modified Paths: -------------- hugin/trunk/CMakeLists.txt Modified: hugin/trunk/CMakeLists.txt =================================================================== --- hugin/trunk/CMakeLists.txt 2009-10-01 01:23:27 UTC (rev 4529) +++ hugin/trunk/CMakeLists.txt 2009-10-01 01:24:47 UTC (rev 4530) @@ -16,7 +16,7 @@ # version set(V_MAJOR 2009) -set(V_MINOR 3) +set(V_MINOR 5) set(V_PATCH 0) # This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yu...@us...> - 2009-10-02 20:51:18
|
Revision: 4557 http://hugin.svn.sourceforge.net/hugin/?rev=4557&view=rev Author: yuv Date: 2009-10-02 18:42:28 +0000 (Fri, 02 Oct 2009) Log Message: ----------- fixed location of man pages for FreeBSD (Vasil Dimov) Modified Paths: -------------- hugin/trunk/CMakeLists.txt Modified: hugin/trunk/CMakeLists.txt =================================================================== --- hugin/trunk/CMakeLists.txt 2009-10-02 17:17:51 UTC (rev 4556) +++ hugin/trunk/CMakeLists.txt 2009-10-02 18:42:28 UTC (rev 4557) @@ -274,13 +274,13 @@ SET(DATADIR share) SET(BINDIR bin) -IF("$ENV{MANDIR}") - SET (MANDIR "$ENV{MANDIR}") -ELSEIF(CMAKE_SYSTEM_NAME=="FreeBSD") - SET (MANDIR "man") -ELSE("$ENV{MANDIR}") - SET (MANDIR "share/man") -ENDIF("$ENV{MANDIR}") +IF (NOT MANDIR AND NOT $ENV{MANDIR} STREQUAL "") + SET (MANDIR "$ENV{MANDIR}") +ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + SET (MANDIR "man") +ELSE(NOT MANDIR AND NOT $ENV{MANDIR} STREQUAL "") + SET (MANDIR "share/man") +ENDIF(NOT MANDIR AND NOT $ENV{MANDIR} STREQUAL "") SET(LOCALEDIR share/locale) SET(ICONDIR share/icons) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kor...@us...> - 2009-10-06 11:58:29
|
Revision: 4585 http://hugin.svn.sourceforge.net/hugin/?rev=4585&view=rev Author: kornelbenko Date: 2009-10-06 11:58:20 +0000 (Tue, 06 Oct 2009) Log Message: ----------- Add FATAL_ERROR-option to cmake_minimum_required to prevent cmake2.4 from continue on processing Modified Paths: -------------- hugin/trunk/CMakeLists.txt Modified: hugin/trunk/CMakeLists.txt =================================================================== --- hugin/trunk/CMakeLists.txt 2009-10-06 07:57:02 UTC (rev 4584) +++ hugin/trunk/CMakeLists.txt 2009-10-06 11:58:20 UTC (rev 4585) @@ -1,6 +1,6 @@ # require at least cmake 2.6 -cmake_minimum_required(VERSION 2.6) +cmake_minimum_required(VERSION 2.6 FATAL_ERROR ) if(COMMAND cmake_policy) cmake_policy(SET CMP0003 NEW) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tm...@us...> - 2009-12-10 06:18:44
|
Revision: 4770 http://hugin.svn.sourceforge.net/hugin/?rev=4770&view=rev Author: tmodes Date: 2009-12-10 06:18:36 +0000 (Thu, 10 Dec 2009) Log Message: ----------- Update cmake to Boost 1.41 (win only) Modified Paths: -------------- hugin/trunk/CMakeLists.txt Modified: hugin/trunk/CMakeLists.txt =================================================================== --- hugin/trunk/CMakeLists.txt 2009-12-10 06:15:28 UTC (rev 4769) +++ hugin/trunk/CMakeLists.txt 2009-12-10 06:18:36 UTC (rev 4770) @@ -206,7 +206,7 @@ if (NOT BOOST_ROOT AND NOT $ENV{BOOST_ROOT} STREQUAL "") set(BOOST_ROOT $ENV{BOOST_ROOT}) else(NOT BOOST_ROOT AND NOT $ENV{BOOST_ROOT} STREQUAL "") - set(BOOST_ROOT ${SOURCE_BASE_DIR}/boost_1_39_0) + set(BOOST_ROOT ${SOURCE_BASE_DIR}/boost_1_41_0) endif(NOT BOOST_ROOT AND NOT $ENV{BOOST_ROOT} STREQUAL "") ENDIF(WIN32) FIND_PACKAGE(Boost COMPONENTS thread) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bru...@us...> - 2009-12-22 23:46:38
|
Revision: 4827 http://hugin.svn.sourceforge.net/hugin/?rev=4827&view=rev Author: brunopostle Date: 2009-12-22 23:46:30 +0000 (Tue, 22 Dec 2009) Log Message: ----------- Bump trunk version to 2010.1.0 Modified Paths: -------------- hugin/trunk/CMakeLists.txt Modified: hugin/trunk/CMakeLists.txt =================================================================== --- hugin/trunk/CMakeLists.txt 2009-12-22 23:45:55 UTC (rev 4826) +++ hugin/trunk/CMakeLists.txt 2009-12-22 23:46:30 UTC (rev 4827) @@ -15,8 +15,8 @@ project(hugin) # version -set(V_MAJOR 2009) -set(V_MINOR 5) +set(V_MAJOR 2010) +set(V_MINOR 1) set(V_PATCH 0) # This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tks...@us...> - 2010-01-13 18:04:19
|
Revision: 4886 http://hugin.svn.sourceforge.net/hugin/?rev=4886&view=rev Author: tksharpless Date: 2010-01-13 18:04:10 +0000 (Wed, 13 Jan 2010) Log Message: ----------- Made revision number suffix of boost root directory a cache variable, so Windows users will no longer have to edit CmakeLists.txt (if they use cmakesetup). Modified Paths: -------------- hugin/trunk/CMakeLists.txt Modified: hugin/trunk/CMakeLists.txt =================================================================== --- hugin/trunk/CMakeLists.txt 2010-01-13 17:27:58 UTC (rev 4885) +++ hugin/trunk/CMakeLists.txt 2010-01-13 18:04:10 UTC (rev 4886) @@ -201,18 +201,25 @@ ## ## Boost ## +# I am sick of having to edit the boost rev number in this file. +# Now it is a cache variable you can edit in cmakesetup --TKS +# +IF( NOT Boost_root_suffix ) + SET( Boost_root_suffix _1_41_0 CACHE STRING "suffix of boost root dir." FORCE ) +ENDIF( NOT Boost_root_suffix ) + IF(WIN32) SET(Boost_USE_STATIC_LIBS ON) # If BOOST_ROOT was defined in the environment, use it. if (NOT BOOST_ROOT AND NOT $ENV{BOOST_ROOT} STREQUAL "") set(BOOST_ROOT $ENV{BOOST_ROOT}) else(NOT BOOST_ROOT AND NOT $ENV{BOOST_ROOT} STREQUAL "") - set(BOOST_ROOT ${SOURCE_BASE_DIR}/boost_1_41_0) + set(BOOST_ROOT ${SOURCE_BASE_DIR}/boost${Boost_root_suffix}) endif(NOT BOOST_ROOT AND NOT $ENV{BOOST_ROOT} STREQUAL "") ENDIF(WIN32) FIND_PACKAGE(Boost COMPONENTS thread) IF (NOT Boost_FOUND) - MESSAGE(FATAL_ERROR "boost thread library not found. If it is installed with a\nunrecognized suffix, specify it with -DBOOST_LIBRARYDIR=<librarydir> and -DBOOST_INCLUDEDIR=<includedir>") + MESSAGE(FATAL_ERROR "boost not found. Bad BOOST_ROOT? On windows, try editing Boost_root_suffix") ENDIF (NOT Boost_FOUND) INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS}) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2010-01-29 14:43:53
|
Revision: 4942 http://hugin.svn.sourceforge.net/hugin/?rev=4942&view=rev Author: stativ Date: 2010-01-29 14:43:47 +0000 (Fri, 29 Jan 2010) Log Message: ----------- Add option (ENABLE_LAPACK...). It doesn't change current behavior, but this is a standard way how to specify additional options in CMake. Modified Paths: -------------- hugin/trunk/CMakeLists.txt Modified: hugin/trunk/CMakeLists.txt =================================================================== --- hugin/trunk/CMakeLists.txt 2010-01-28 19:28:32 UTC (rev 4941) +++ hugin/trunk/CMakeLists.txt 2010-01-29 14:43:47 UTC (rev 4942) @@ -233,8 +233,9 @@ ENDIF(MSGFMT_FOUND) ## -## LAPACK (optional, enable by -DENABLE_LAPACK=YES +## LAPACK (optional, enable by -DENABLE_LAPACK=YES) ## +option (ENABLE_LAPACK "Use lapack based solver in levmar" OFF) IF(ENABLE_LAPACK) FIND_PACKAGE(LAPACK) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2010-02-01 08:35:46
|
Revision: 4954 http://hugin.svn.sourceforge.net/hugin/?rev=4954&view=rev Author: stativ Date: 2010-02-01 08:35:39 +0000 (Mon, 01 Feb 2010) Log Message: ----------- re-add LAPACK option removed by mistake in rev 4951. Revision Links: -------------- http://hugin.svn.sourceforge.net/hugin/?rev=4951&view=rev Modified Paths: -------------- hugin/trunk/CMakeLists.txt Modified: hugin/trunk/CMakeLists.txt =================================================================== --- hugin/trunk/CMakeLists.txt 2010-01-31 21:26:46 UTC (rev 4953) +++ hugin/trunk/CMakeLists.txt 2010-02-01 08:35:39 UTC (rev 4954) @@ -233,8 +233,9 @@ ENDIF(MSGFMT_FOUND) ## -## LAPACK (optional, enable by -DENABLE_LAPACK=YES +## LAPACK (optional, enable by -DENABLE_LAPACK=ON) ## +OPTION (ENABLE_LAPACK "Use LAPACK based solver in levmar" OFF) IF(ENABLE_LAPACK) FIND_PACKAGE(LAPACK) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <bru...@us...> - 2010-05-17 22:21:03
|
Revision: 5161 http://hugin.svn.sourceforge.net/hugin/?rev=5161&view=rev Author: brunopostle Date: 2010-05-17 22:20:57 +0000 (Mon, 17 May 2010) Log Message: ----------- Break the SVN trunk build and suggest using mercurial repository instead. Modified Paths: -------------- hugin/trunk/CMakeLists.txt Modified: hugin/trunk/CMakeLists.txt =================================================================== --- hugin/trunk/CMakeLists.txt 2010-05-16 01:47:00 UTC (rev 5160) +++ hugin/trunk/CMakeLists.txt 2010-05-17 22:20:57 UTC (rev 5161) @@ -11,6 +11,11 @@ include(HuginMacros) include(CheckIncludeFiles) +IF (NOT BUILD_ANYWAY) + MESSAGE(FATAL_ERROR "Subversion repository is disused, please use the mercurial repository. Define BUILD_ANYWAY to ignore this message, e.g. + cmake -DBUILD_ANYWAY=1 .") +ENDIF (NOT BUILD_ANYWAY) + ## global setup project(hugin) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |