Thanks for helping keep SourceForge clean.

Click URL instructions:
Right-click on ad, choose "Copy Link", then paste here →
(This may not be possible with some types of ads)

More information about our ad policies

Hugin

Panorama photo stitcher

Brought to you by: acmihal, brunopostle, dangelo, jlegg, and 2 others

[Hugin-cvs] SF.net SVN: hugin: [2546] hugin/trunk/CMakeLists.txt

[Hugin-cvs] SF.net SVN: hugin: [2546] hugin/trunk/CMakeLists.txt

From: <dmg@us...> - 2007-12-01 12:00:45

Revision: 2546
          http://hugin.svn.sourceforge.net/hugin/?rev=2546&view=rev
Author:   dmg
Date:     2007-12-01 04:00:43 -0800 (Sat, 01 Dec 2007)

Log Message:
-----------
Fixed typos in cmake script

Modified Paths:
--------------
    hugin/trunk/CMakeLists.txt

Modified: hugin/trunk/CMakeLists.txt
===================================================================
--- hugin/trunk/CMakeLists.txt	2007-11-28 23:43:26 UTC (rev 2545)
+++ hugin/trunk/CMakeLists.txt	2007-12-01 12:00:43 UTC (rev 2546)
@@ -72,8 +72,8 @@
   SET(PANO_LIBRARIES ${PANO13_LIBRARIES})
   SET(PANO_INCLUDE_DIR ${PANO13_INCLUDE_DIR})
 ELSEIF(PANO12_FOUND)
-  SET(PANO_LIBRARIES ${PANO13_LIBRARIES})
-  SET(PANO_INCLUDE_DIR ${PANO13_INCLUDE_DIR})
+  SET(PANO_LIBRARIES ${PANO12_LIBRARIES})
+  SET(PANO_INCLUDE_DIR ${PANO12_INCLUDE_DIR})
 ELSE(PANO13_FOUND)
   MESSAGE(SEND_ERROR "Either libpano13 or libpano12 are required")
 ENDIF(PANO13_FOUND) 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Thread view

[Hugin-cvs] SF.net SVN: hugin: [2335] hugin/trunk/CMakeLists.txt

From: <dangelo@us...> - 2007-07-27 06:06:58

Revision: 2335
          http://hugin.svn.sourceforge.net/hugin/?rev=2335&view=rev
Author:   dangelo
Date:     2007-07-26 23:06:56 -0700 (Thu, 26 Jul 2007)

Log Message:
-----------
add -Wall and -DDEBUG if building in debug mode

Modified Paths:
--------------
    hugin/trunk/CMakeLists.txt

Modified: hugin/trunk/CMakeLists.txt
===================================================================
--- hugin/trunk/CMakeLists.txt	2007-07-26 23:12:33 UTC (rev 2334)
+++ hugin/trunk/CMakeLists.txt	2007-07-27 06:06:56 UTC (rev 2335)
@@ -66,10 +66,13 @@
 #  SET(CMAKE_BUILD_TYPE Release)
 #ENDIF(WANT_DEBUG)
 
-IF(CMAKE_BUILD_MODE STREQUAL "Debug")
+IF(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
   MESSAGE("Building in Debug mode, resulting programs will be SLOW")
   ADD_DEFINITIONS(-DDEBUG)
-ENDIF(CMAKE_BUILD_MODE STREQUAL "Debug")
+  IF(UNIX)
+    ADD_DEFINITIONS(-Wall)
+  ENDIF(UNIX)
+ENDIF(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
 
 #IF(UNIX)
 #  SET(CMAKE_CXX_FLAGS_RELEASE "-O2 -Wall" CACHE)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Hugin-cvs] SF.net SVN: hugin: [2353] hugin/trunk/CMakeLists.txt

From: <jdtsmith@us...> - 2007-08-04 03:22:32

Revision: 2353
          http://hugin.svn.sourceforge.net/hugin/?rev=2353&view=rev
Author:   jdtsmith
Date:     2007-08-03 20:22:31 -0700 (Fri, 03 Aug 2007)

Log Message:
-----------
Remove APPLE warning.

Modified Paths:
--------------
    hugin/trunk/CMakeLists.txt

Modified: hugin/trunk/CMakeLists.txt
===================================================================
--- hugin/trunk/CMakeLists.txt	2007-08-04 03:04:44 UTC (rev 2352)
+++ hugin/trunk/CMakeLists.txt	2007-08-04 03:22:31 UTC (rev 2353)
@@ -99,8 +99,6 @@
   # backward compatibility
   SET(INSTALL_XRC_DIR xrc)
   SET(INSTALL_LOCALE_DIR locale)
-ELSEIF(APPLE)
-  MESSAGE("WARNING: installation for OSX not yet supported")
 ENDIF(UNIX)
 
 # create config.h file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Hugin-cvs] SF.net SVN: hugin: [2359] hugin/trunk/CMakeLists.txt

From: <jdtsmith@us...> - 2007-08-04 20:40:33

Revision: 2359
          http://hugin.svn.sourceforge.net/hugin/?rev=2359&view=rev
Author:   jdtsmith
Date:     2007-08-04 13:40:32 -0700 (Sat, 04 Aug 2007)

Log Message:
-----------
Install patch for -flat_namespace linking, not needed for CMake >=2.5.x.
Note that CMake 2.4.7 or later is required on OSX for correctly
compiling C++ templates.

Modified Paths:
--------------
    hugin/trunk/CMakeLists.txt

Modified: hugin/trunk/CMakeLists.txt
===================================================================
--- hugin/trunk/CMakeLists.txt	2007-08-04 16:31:15 UTC (rev 2358)
+++ hugin/trunk/CMakeLists.txt	2007-08-04 20:40:32 UTC (rev 2359)
@@ -101,6 +101,19 @@
   SET(INSTALL_LOCALE_DIR locale)
 ENDIF(UNIX)
 
+
+#This namespace workaround is not needed for CMake >= 2.5.x
+IF (APPLE) 
+   ## Add needed Compiler and Linker flags for OSX
+      IF (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
+      	 SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -flat_namespace -undefined suppress" )
+	 SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flat_namespace -undefined suppress" )
+	 SET (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -flat_namespace -undefined suppress" )
+	 SET (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -flat_namespace -undefined suppress" )
+	 SET (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -flat_namespace -undefined suppress" )
+      ENDIF (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
+ENDIF (APPLE)
+
 # create config.h file
 configure_file(src/include/config.h.in.cmake ${CMAKE_BINARY_DIR}/src/include/config.h)
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Hugin-cvs] SF.net SVN: hugin: [2512] hugin/trunk/CMakeLists.txt

From: <dangelo@us...> - 2007-10-29 20:00:25

Revision: 2512
          http://hugin.svn.sourceforge.net/hugin/?rev=2512&view=rev
Author:   dangelo
Date:     2007-10-29 13:00:17 -0700 (Mon, 29 Oct 2007)

Log Message:
-----------
added more CPack ignore patterns

Modified Paths:
--------------
    hugin/trunk/CMakeLists.txt

Modified: hugin/trunk/CMakeLists.txt
===================================================================
--- hugin/trunk/CMakeLists.txt	2007-10-29 19:20:23 UTC (rev 2511)
+++ hugin/trunk/CMakeLists.txt	2007-10-29 20:00:17 UTC (rev 2512)
@@ -212,6 +212,7 @@
 "\\\\.a$"
 "\\\\.lo$"
 "\\\\.so$"
+"\\\\.so\\\\.0$" 
 "\\\\.la$"
 "Makefile\\\\.in$"
  )


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Hugin-cvs] SF.net SVN: hugin: [2532] hugin/trunk/CMakeLists.txt

From: <brunopostle@us...> - 2007-11-13 21:13:08

Revision: 2532
          http://hugin.svn.sourceforge.net/hugin/?rev=2532&view=rev
Author:   brunopostle
Date:     2007-11-13 13:13:01 -0800 (Tue, 13 Nov 2007)

Log Message:
-----------
Don't bundle .so.0.0 files in the source tarball

Modified Paths:
--------------
    hugin/trunk/CMakeLists.txt

Modified: hugin/trunk/CMakeLists.txt
===================================================================
--- hugin/trunk/CMakeLists.txt	2007-11-11 01:09:43 UTC (rev 2531)
+++ hugin/trunk/CMakeLists.txt	2007-11-13 21:13:01 UTC (rev 2532)
@@ -223,6 +223,7 @@
 "\\\\.lo$"
 "\\\\.so$"
 "\\\\.so\\\\.0$" 
+"\\\\.so\\\\.0\\\\.0$" 
 "\\\\.la$"
 "Makefile\\\\.in$"
  )


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Hugin-cvs] SF.net SVN: hugin: [2546] hugin/trunk/CMakeLists.txt

From: <dmg@us...> - 2007-12-01 12:00:45

Revision: 2546
          http://hugin.svn.sourceforge.net/hugin/?rev=2546&view=rev
Author:   dmg
Date:     2007-12-01 04:00:43 -0800 (Sat, 01 Dec 2007)

Log Message:
-----------
Fixed typos in cmake script

Modified Paths:
--------------
    hugin/trunk/CMakeLists.txt

Modified: hugin/trunk/CMakeLists.txt
===================================================================
--- hugin/trunk/CMakeLists.txt	2007-11-28 23:43:26 UTC (rev 2545)
+++ hugin/trunk/CMakeLists.txt	2007-12-01 12:00:43 UTC (rev 2546)
@@ -72,8 +72,8 @@
   SET(PANO_LIBRARIES ${PANO13_LIBRARIES})
   SET(PANO_INCLUDE_DIR ${PANO13_INCLUDE_DIR})
 ELSEIF(PANO12_FOUND)
-  SET(PANO_LIBRARIES ${PANO13_LIBRARIES})
-  SET(PANO_INCLUDE_DIR ${PANO13_INCLUDE_DIR})
+  SET(PANO_LIBRARIES ${PANO12_LIBRARIES})
+  SET(PANO_INCLUDE_DIR ${PANO12_INCLUDE_DIR})
 ELSE(PANO13_FOUND)
   MESSAGE(SEND_ERROR "Either libpano13 or libpano12 are required")
 ENDIF(PANO13_FOUND) 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Hugin-cvs] SF.net SVN: hugin: [3000] hugin/trunk/CMakeLists.txt

From: <brunopostle@us...> - 2008-04-06 20:06:35

Revision: 3000
          http://hugin.svn.sourceforge.net/hugin/?rev=3000&view=rev
Author:   brunopostle
Date:     2008-04-06 13:06:09 -0700 (Sun, 06 Apr 2008)

Log Message:
-----------
Some more binaries that don't need to go in dist tarballs

Modified Paths:
--------------
    hugin/trunk/CMakeLists.txt

Modified: hugin/trunk/CMakeLists.txt
===================================================================
--- hugin/trunk/CMakeLists.txt	2008-04-05 22:03:15 UTC (rev 2999)
+++ hugin/trunk/CMakeLists.txt	2008-04-06 20:06:09 UTC (rev 3000)
@@ -313,6 +313,9 @@
 "/tools/fulla$"
 "/tools/nona$"
 "/tools/vig_optimize$"
+"/tools/align_image_stack$"
+"/tools/tca_correct$"
+"/matchpoint/matchpoint$"
 "/hugin/hugin$"
 "/nona_gui/nona_gui$"
 "/stitch_project/hugin_stitch_project$"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Hugin-cvs] SF.net SVN: hugin: [3114] hugin/trunk/CMakeLists.txt

From: <dwilkins42@us...> - 2008-06-07 05:37:07

Revision: 3114
          http://hugin.svn.sourceforge.net/hugin/?rev=3114&view=rev
Author:   dwilkins42
Date:     2008-06-06 22:37:05 -0700 (Fri, 06 Jun 2008)

Log Message:
-----------
Update MSVC flag modifications

Modified Paths:
--------------
    hugin/trunk/CMakeLists.txt

Modified: hugin/trunk/CMakeLists.txt
===================================================================
--- hugin/trunk/CMakeLists.txt	2008-06-06 17:46:28 UTC (rev 3113)
+++ hugin/trunk/CMakeLists.txt	2008-06-07 05:37:05 UTC (rev 3114)
@@ -248,18 +248,27 @@
     # Stop MSVC9 from bitching about POSIX names without underscores
     ADD_DEFINITIONS(/D_CRT_NONSTDC_NO_DEPRECATE)
     # compile everything for the static C runtime
-    STRING(REPLACE /MD /MT CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE})
-    STRING(REPLACE /MD /MT CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG})
-    STRING(REPLACE /MD /MT CMAKE_CXX_FLAGS_MINSIZEREL ${CMAKE_CXX_FLAGS_MINSIZEREL})
-    STRING(REPLACE /MD /MT CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS_RELWITHDEBINFO})
-    STRING(REPLACE /MD /MT CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE})
-    STRING(REPLACE /MD /MT CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
-    STRING(REPLACE /MD /MT CMAKE_C_FLAGS_MINSIZEREL ${CMAKE_C_FLAGS_MINSIZEREL})
-    STRING(REPLACE /MD /MT CMAKE_C_FLAGS_RELWITHDEBINFO ${CMAKE_C_FLAGS_RELWITHDEBINFO})
+	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
-        ${CMAKE_EXE_LINKER_FLAGS} /noDefaultLib:MSVCRT /noDefaultLib:MSVCRTd
-       CACHE STRING "for MSVC"
+        "${NEW_FLAGS} /NODEFAULTLIB:\"MSVCRT.lib\" /NODEFAULTLIB:\"MSVCRTd.lib\""
+       CACHE STRING "for MSVC" FORCE
     )
   ENDIF(MSVC)
 ENDIF (UNIX)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.