diff --git a/CMakeLists.txt b/CMakeLists.txt index 55d81ec31..6908820ed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -173,7 +173,7 @@ SET(BUILD_PLATFORM "${PLATFORM_NAME}:${PLATFORM_ABI}" CACHE STRING # Make sure "sandbox" input & output directories are set. During # SimTK Core build, the build system will set them. Otherwise, we'll # set them to sensible local values. -# If SimTK_INSTALL_PREFIX is set then +# If CMAKE_INSTALL_PREFIX is set then # it is a sandbox installation area, otherwise we want to install # in /usr/local/simbody or %ProgramFiles%\Simbody. # @@ -183,14 +183,21 @@ SET(BUILD_PLATFORM "${PLATFORM_NAME}:${PLATFORM_ABI}" CACHE STRING # older system you might have to set it manually. SET(LIB64) +# For backward compatibility, use SimTK_INSTALL_PREFIX if +# CMAKE_INSTALL_PREFIX hasn't been set. +IF(SimTK_INSTALL_PREFIX AND CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + SET(CMAKE_INSTALL_PREFIX ${SimTK_INSTALL_PREFIX} CACHE PATH + "Install path prefix." FORCE) +ENDIF() + # C compiler is gcc on Linux, gcc or cc on Mac where command line tools # are installed from XCode. May be clang in Mac 10.8 or later. IF(${CMAKE_C_COMPILER} MATCHES "cc" OR ${CMAKE_C_COMPILER} MATCHES "clang") - IF(NOT SimTK_INSTALL_PREFIX) - SET(SimTK_INSTALL_PREFIX "/usr/local/simbody" + IF(NOT CMAKE_INSTALL_PREFIX) + SET(CMAKE_INSTALL_PREFIX "/usr/local/simbody" CACHE PATH "Install directory") - ENDIF(NOT SimTK_INSTALL_PREFIX) + ENDIF(NOT CMAKE_INSTALL_PREFIX) # As of Ubuntu 12, 64 bit libraries are in lib, not lib64 #IF(${CMAKE_SIZEOF_VOID_P} EQUAL 8) @@ -214,21 +221,13 @@ ELSE() # Windows endif() ENDIF() - IF(NOT SimTK_INSTALL_PREFIX) - SET(SimTK_INSTALL_PREFIX "${PROGFILEDIR}/Simbody" + IF(NOT CMAKE_INSTALL_PREFIX) + SET(CMAKE_INSTALL_PREFIX "${PROGFILEDIR}/Simbody" CACHE PATH "Install directory") - ENDIF(NOT SimTK_INSTALL_PREFIX) + ENDIF(NOT CMAKE_INSTALL_PREFIX) ENDIF() -# CMake installs go into CMAKE_INSTALL_PREFIX, which is always -# set to something incorrect by CMake. We'll use SimTK_INSTALL_PREFIX -# instead which is passed in by the build system or set above. -SET(CMAKE_INSTALL_PREFIX ${SimTK_INSTALL_PREFIX} CACHE STRING - "Install path prefix." FORCE) -# User should set SimTK_INSTALL_PREFIX, so suppress cmake's -mark_as_advanced(CMAKE_INSTALL_PREFIX) - # On Mac, we'll use the defaults for the architecture and deployment target. # This works OK on OSX 10.8. For older systems, or if you want to build for # an older deployment target, or 32 bit or univeral binaries, you may have diff --git a/Platform/CMakeLists.txt b/Platform/CMakeLists.txt index 585e54298..6ebeb96a1 100644 --- a/Platform/CMakeLists.txt +++ b/Platform/CMakeLists.txt @@ -64,13 +64,13 @@ FOREACH(LIBF ${LIB_FILES}) PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_EXECUTE - DESTINATION ${SimTK_INSTALL_PREFIX}/bin) + DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) ELSE() INSTALL(FILES ${LIBF} PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ GROUP_WRITE WORLD_READ - DESTINATION ${SimTK_INSTALL_PREFIX}/lib${LIB64}) + DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB64}) ENDIF() ENDFOREACH() @@ -93,6 +93,6 @@ FOREACH(INCLF ${INCL_FILES}) PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ GROUP_WRITE WORLD_READ - DESTINATION ${SimTK_INSTALL_PREFIX}/include ) + DESTINATION ${CMAKE_INSTALL_PREFIX}/include ) ENDFOREACH() diff --git a/SimTKcommon/sharedTarget/CMakeLists.txt b/SimTKcommon/sharedTarget/CMakeLists.txt index 4e108305b..7edccc8c4 100644 --- a/SimTKcommon/sharedTarget/CMakeLists.txt +++ b/SimTKcommon/sharedTarget/CMakeLists.txt @@ -22,9 +22,9 @@ IF(BUILD_UNVERSIONED_LIBRARIES) PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_EXECUTE - LIBRARY DESTINATION ${SimTK_INSTALL_PREFIX}/lib${LIB64} - ARCHIVE DESTINATION ${SimTK_INSTALL_PREFIX}/lib${LIB64} - RUNTIME DESTINATION ${SimTK_INSTALL_PREFIX}/bin ) + LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB64} + ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB64} + RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin ) ENDIF(BUILD_UNVERSIONED_LIBRARIES) IF(BUILD_VERSIONED_LIBRARIES) @@ -46,9 +46,9 @@ IF(BUILD_VERSIONED_LIBRARIES) PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_EXECUTE - LIBRARY DESTINATION ${SimTK_INSTALL_PREFIX}/lib${LIB64} - ARCHIVE DESTINATION ${SimTK_INSTALL_PREFIX}/lib${LIB64} - RUNTIME DESTINATION ${SimTK_INSTALL_PREFIX}/bin ) + LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB64} + ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB64} + RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin ) ENDIF(BUILD_VERSIONED_LIBRARIES) diff --git a/SimTKcommon/staticTarget/CMakeLists.txt b/SimTKcommon/staticTarget/CMakeLists.txt index f47d41756..a34d8e8a0 100644 --- a/SimTKcommon/staticTarget/CMakeLists.txt +++ b/SimTKcommon/staticTarget/CMakeLists.txt @@ -18,9 +18,9 @@ IF(BUILD_UNVERSIONED_LIBRARIES) INSTALL(TARGETS ${STATIC_TARGET} PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ GROUP_WRITE WORLD_READ - ARCHIVE DESTINATION ${SimTK_INSTALL_PREFIX}/lib${LIB64} - LIBRARY DESTINATION ${SimTK_INSTALL_PREFIX}/lib${LIB64} - RUNTIME DESTINATION ${SimTK_INSTALL_PREFIX}/bin ) + ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB64} + LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB64} + RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin ) ENDIF(BUILD_UNVERSIONED_LIBRARIES) IF(BUILD_VERSIONED_LIBRARIES) @@ -37,7 +37,7 @@ IF(BUILD_VERSIONED_LIBRARIES) INSTALL(TARGETS ${STATIC_TARGET_VN} PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ GROUP_WRITE WORLD_READ - ARCHIVE DESTINATION ${SimTK_INSTALL_PREFIX}/lib${LIB64} - LIBRARY DESTINATION ${SimTK_INSTALL_PREFIX}/lib${LIB64} - RUNTIME DESTINATION ${SimTK_INSTALL_PREFIX}/bin ) + ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB64} + LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB64} + RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin ) ENDIF(BUILD_VERSIONED_LIBRARIES) diff --git a/SimTKmath/sharedTarget/CMakeLists.txt b/SimTKmath/sharedTarget/CMakeLists.txt index 74d7009d7..c87abf5b0 100644 --- a/SimTKmath/sharedTarget/CMakeLists.txt +++ b/SimTKmath/sharedTarget/CMakeLists.txt @@ -44,9 +44,9 @@ IF(BUILD_UNVERSIONED_LIBRARIES) PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_EXECUTE - LIBRARY DESTINATION ${SimTK_INSTALL_PREFIX}/lib${LIB64} - ARCHIVE DESTINATION ${SimTK_INSTALL_PREFIX}/lib${LIB64} - RUNTIME DESTINATION ${SimTK_INSTALL_PREFIX}/bin) + LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB64} + ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB64} + RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) ENDIF(BUILD_UNVERSIONED_LIBRARIES) @@ -71,8 +71,8 @@ IF(BUILD_VERSIONED_LIBRARIES) PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_EXECUTE - LIBRARY DESTINATION ${SimTK_INSTALL_PREFIX}/lib${LIB64} - ARCHIVE DESTINATION ${SimTK_INSTALL_PREFIX}/lib${LIB64} - RUNTIME DESTINATION ${SimTK_INSTALL_PREFIX}/bin) + LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB64} + ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB64} + RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) ENDIF(BUILD_VERSIONED_LIBRARIES) diff --git a/SimTKmath/staticTarget/CMakeLists.txt b/SimTKmath/staticTarget/CMakeLists.txt index fecb5531d..cc10ddb4f 100644 --- a/SimTKmath/staticTarget/CMakeLists.txt +++ b/SimTKmath/staticTarget/CMakeLists.txt @@ -45,9 +45,9 @@ IF(BUILD_UNVERSIONED_LIBRARIES) PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ GROUP_WRITE WORLD_READ - ARCHIVE DESTINATION ${SimTK_INSTALL_PREFIX}/lib${LIB64} - LIBRARY DESTINATION ${SimTK_INSTALL_PREFIX}/lib${LIB64} - RUNTIME DESTINATION ${SimTK_INSTALL_PREFIX}/bin) + ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB64} + LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB64} + RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) ENDIF(BUILD_UNVERSIONED_LIBRARIES) @@ -71,8 +71,8 @@ IF(BUILD_VERSIONED_LIBRARIES) PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ GROUP_WRITE WORLD_READ - ARCHIVE DESTINATION ${SimTK_INSTALL_PREFIX}/lib${LIB64} - LIBRARY DESTINATION ${SimTK_INSTALL_PREFIX}/lib${LIB64} - RUNTIME DESTINATION ${SimTK_INSTALL_PREFIX}/bin) + ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB64} + LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB64} + RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) ENDIF(BUILD_VERSIONED_LIBRARIES) diff --git a/Simbody/Visualizer/VisualizerGUI/CMakeLists.txt b/Simbody/Visualizer/VisualizerGUI/CMakeLists.txt index 50de1909c..960f5c628 100644 --- a/Simbody/Visualizer/VisualizerGUI/CMakeLists.txt +++ b/Simbody/Visualizer/VisualizerGUI/CMakeLists.txt @@ -36,7 +36,7 @@ INSTALL(TARGETS ${GUI_NAME} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_EXECUTE - DESTINATION ${SimTK_INSTALL_PREFIX}/bin) + DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) # on Windows we also have to copy and later install the glut32.dll IF(WIN32) @@ -47,5 +47,5 @@ IF(WIN32) COMMENT "Copying glut32.dll" VERBATIM) INSTALL(FILES ${glut32libdir}/glut32.dll - DESTINATION ${SimTK_INSTALL_PREFIX}/bin) #same as GUI + DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) #same as GUI ENDIF() diff --git a/Simbody/sharedTarget/CMakeLists.txt b/Simbody/sharedTarget/CMakeLists.txt index 0be2d1b08..03838da9c 100644 --- a/Simbody/sharedTarget/CMakeLists.txt +++ b/Simbody/sharedTarget/CMakeLists.txt @@ -26,9 +26,9 @@ IF(BUILD_UNVERSIONED_LIBRARIES) PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_EXECUTE - LIBRARY DESTINATION ${SimTK_INSTALL_PREFIX}/lib${LIB64} - ARCHIVE DESTINATION ${SimTK_INSTALL_PREFIX}/lib${LIB64} - RUNTIME DESTINATION ${SimTK_INSTALL_PREFIX}/bin) + LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB64} + ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB64} + RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) ENDIF(BUILD_UNVERSIONED_LIBRARIES) @@ -57,8 +57,8 @@ IF(BUILD_VERSIONED_LIBRARIES) PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_EXECUTE - LIBRARY DESTINATION ${SimTK_INSTALL_PREFIX}/lib${LIB64} - ARCHIVE DESTINATION ${SimTK_INSTALL_PREFIX}/lib${LIB64} - RUNTIME DESTINATION ${SimTK_INSTALL_PREFIX}/bin) + LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB64} + ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB64} + RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) ENDIF(BUILD_VERSIONED_LIBRARIES) diff --git a/Simbody/staticTarget/CMakeLists.txt b/Simbody/staticTarget/CMakeLists.txt index 170ac554d..113dfde2b 100644 --- a/Simbody/staticTarget/CMakeLists.txt +++ b/Simbody/staticTarget/CMakeLists.txt @@ -26,9 +26,9 @@ IF(BUILD_UNVERSIONED_LIBRARIES) PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ GROUP_WRITE WORLD_READ - ARCHIVE DESTINATION ${SimTK_INSTALL_PREFIX}/lib${LIB64} - LIBRARY DESTINATION ${SimTK_INSTALL_PREFIX}/lib${LIB64} - RUNTIME DESTINATION ${SimTK_INSTALL_PREFIX}/bin) + ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB64} + LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB64} + RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) ENDIF(BUILD_UNVERSIONED_LIBRARIES) @@ -56,8 +56,8 @@ IF(BUILD_VERSIONED_LIBRARIES) PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ GROUP_WRITE WORLD_READ - ARCHIVE DESTINATION ${SimTK_INSTALL_PREFIX}/lib${LIB64} - LIBRARY DESTINATION ${SimTK_INSTALL_PREFIX}/lib${LIB64} - RUNTIME DESTINATION ${SimTK_INSTALL_PREFIX}/bin) + ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB64} + LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB64} + RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) ENDIF(BUILD_VERSIONED_LIBRARIES) diff --git a/debian/changelog b/debian/changelog index fdd52d104..55a5b3c85 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ -simbody (3.0-1~quantal) quantal; urgency=high +simbody (3.3-1~quantal) quantal; urgency=high - * Release 3.0 + * Release 3.3 -- Jose Luis Rivero Thu, 22 Aug 2013 16:23:00 -0700 diff --git a/debian/rules b/debian/rules index cd66610dc..9a66bccc9 100755 --- a/debian/rules +++ b/debian/rules @@ -8,7 +8,7 @@ override_dh_auto_configure: dh_auto_configure -- \ - -DSimTK_INSTALL_PREFIX:PATH=/usr \ + -DCMAKE_INSTALL_PREFIX:PATH=/usr \ -DBUILD_EXAMPLES:BOOL=False override_dh_auto_install: