Diff of /CMakeLists.txt [6e0722] .. [b5bddb]  Maximize  Restore

Switch to unified view

a/CMakeLists.txt b/CMakeLists.txt
...
...
335
    IF (CMAKE_INSTALL_PREFIX STREQUAL "/opt/local")
335
    IF (CMAKE_INSTALL_PREFIX STREQUAL "/opt/local")
336
      # MacPorts
336
      # MacPorts
337
      SET(INSTALL_OSX_BUNDLE_DIR /Applications/MacPorts CACHE DOCSTRING "Install directory Hugin and HuginStitchProject application bundles")
337
      SET(INSTALL_OSX_BUNDLE_DIR /Applications/MacPorts CACHE DOCSTRING "Install directory Hugin and HuginStitchProject application bundles")
338
    ELSE(CMAKE_INSTALL_PREFIX STREQUAL "/opt/local")
338
    ELSE(CMAKE_INSTALL_PREFIX STREQUAL "/opt/local")
339
      # fink or other custom system.
339
      # fink or other custom system.
340
      SET(INSTALL_OSX_BUNDLE_DIR ${CMAKE_INSTALL_PREFIX}/Application CACHE DOCSTRING "Install directory Hugin and HuginStitchProject application bundles")
340
      SET(INSTALL_OSX_BUNDLE_DIR ${CMAKE_INSTALL_PREFIX}/Applications CACHE DOCSTRING "Install directory Hugin and HuginStitchProject application bundles")
341
    ENDIF(CMAKE_INSTALL_PREFIX STREQUAL "/opt/local")
341
    ENDIF(CMAKE_INSTALL_PREFIX STREQUAL "/opt/local")
342
    MESSAGE("*** Will install application bundles in ${INSTALL_OSX_BUNDLE_DIR}, set INSTALL_OSX_BUNDLE_DIR to change the location")
342
    MESSAGE("*** Will install application bundles in ${INSTALL_OSX_BUNDLE_DIR}, set INSTALL_OSX_BUNDLE_DIR to change the location")
343
  ENDIF (NOT MAC_SELF_CONTAINED_BUNDLE)
343
  ENDIF (NOT MAC_SELF_CONTAINED_BUNDLE)
344
ENDIF (APPLE)
344
ENDIF (APPLE)
345
345
...
...
422
     SET (CMAKE_CXX_FLAGS:STRING "\"$CMAKE_CXX_FLAGS\" -flat_namespace -undefined suppress" )
422
     SET (CMAKE_CXX_FLAGS:STRING "\"$CMAKE_CXX_FLAGS\" -flat_namespace -undefined suppress" )
423
     SET (CMAKE_LDFLAGS:STRING "\"$CMAKE_LD_FLAGS\"" )
423
     SET (CMAKE_LDFLAGS:STRING "\"$CMAKE_LD_FLAGS\"" )
424
     SET (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}  -flat_namespace -undefined suppress" )
424
     SET (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}  -flat_namespace -undefined suppress" )
425
     SET (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS}  -flat_namespace -undefined suppress" )
425
     SET (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS}  -flat_namespace -undefined suppress" )
426
     SET (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}  -flat_namespace -undefined suppress" )
426
     SET (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}  -flat_namespace -undefined suppress" )
427
         SET (CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib" )
427
     IF (${CMAKE_BUILD_TYPE} STREQUAL "Release")
428
     IF (${CMAKE_BUILD_TYPE} STREQUAL "Release")
428
        SET (CMAKE_C_FLAGS_RELEASE:STRING " $CMAKE_C_FLAGS_RELEASE ")
429
        SET (CMAKE_C_FLAGS_RELEASE:STRING " $CMAKE_C_FLAGS_RELEASE ")
429
        SET (CMAKE_CXX_FLAGS_RELEASE:STRING " $CMAKE_CXX_FLAGS_RELEASE ")
430
        SET (CMAKE_CXX_FLAGS_RELEASE:STRING " $CMAKE_CXX_FLAGS_RELEASE ")
430
     ENDIF (${CMAKE_BUILD_TYPE} STREQUAL "Release")
431
     ENDIF (${CMAKE_BUILD_TYPE} STREQUAL "Release")
431
      ENDIF (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
432
      ENDIF (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)