From: <har...@us...> - 2008-10-15 11:47:18
|
Revision: 3507 http://hugin.svn.sourceforge.net/hugin/?rev=3507&view=rev Author: harryvanderwolf Date: 2008-10-15 11:47:11 +0000 (Wed, 15 Oct 2008) Log Message: ----------- Celeste overwrites main project CMAKE settings. This breaks APPLE cross compilation. Changed to append statement Modified Paths: -------------- hugin/trunk/src/celeste/CMakeLists.txt Modified: hugin/trunk/src/celeste/CMakeLists.txt =================================================================== --- hugin/trunk/src/celeste/CMakeLists.txt 2008-10-15 08:56:20 UTC (rev 3506) +++ hugin/trunk/src/celeste/CMakeLists.txt 2008-10-15 11:47:11 UTC (rev 3507) @@ -8,14 +8,14 @@ COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Config.h.win32 ${CMAKE_CURRENT_SOURCE_DIR}/Config.h DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/Config.h.win32 ) - set(CMAKE_CXX_FLAGS "-nologo -O2 -EHsc -I. -D __WIN32__ -D _CRT_SECURE_NO_DEPRECATE") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -nologo -O2 -EHsc -I. -D __WIN32__ -D _CRT_SECURE_NO_DEPRECATE") ELSE (WIN32) ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/Config.h COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/Config.h.linux ${CMAKE_CURRENT_SOURCE_DIR}/Config.h DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/Config.h.linux ) - set(CMAKE_CXX_FLAGS "-O3") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3") ENDIF(WIN32) # a list of all files belonging to celeste library This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yu...@us...> - 2009-07-26 13:32:38
|
Revision: 4103 http://hugin.svn.sourceforge.net/hugin/?rev=4103&view=rev Author: yuv Date: 2009-07-26 13:32:25 +0000 (Sun, 26 Jul 2009) Log Message: ----------- fix CMake location of celeste model (Kornel Benko) Modified Paths: -------------- hugin/trunk/src/celeste/CMakeLists.txt Modified: hugin/trunk/src/celeste/CMakeLists.txt =================================================================== --- hugin/trunk/src/celeste/CMakeLists.txt 2009-07-26 13:23:20 UTC (rev 4102) +++ hugin/trunk/src/celeste/CMakeLists.txt 2009-07-26 13:32:25 UTC (rev 4103) @@ -94,6 +94,6 @@ ) INSTALL(TARGETS celeste_standalone DESTINATION ${BINDIR}) -INSTALL(FILES ${CELESTE_MODEL} DESTINATION ${HUGINDATADIR}) +INSTALL(FILES ${CELESTE_MODEL} DESTINATION ${INSTALL_DATA_DIR}) add_subdirectory(training) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |