jcarr
/
coriolis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* All tools: 

- Change: In the CMakeLists.txt, in all the install commands remove all
        the leading "/" as they prevents the CMAKE_INSTALL_PREFIX to be took
        into account. It was nevertheless working because buildCoriolis.py was
        using DESTDIR which is prepended anyway.
  * ./goodies:
    - Change: In buildCoriolis.py, no longer uses the DESTDIR but instead
        CMAKE_INSTALL_PREFIX.
This commit is contained in:
Jean-Paul Chaput 2010-05-16 16:33:58 +00:00
parent 1a874d564a
commit f8d79dc53e
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hurricane/cmake_modules/CMakeLists.txt
View File

@ -1,2 +1,2 @@
install(FILES FindHURRICANE.cmake FindBISON.cmake FindFLEX.cmake install(FILES FindHURRICANE.cmake FindBISON.cmake FindFLEX.cmake
DESTINATION /share/cmake_modules) DESTINATION share/cmake_modules)

4
hurricane/doc/hurricane/CMakeLists.txt
View File

@ -1,6 +1,6 @@
set ( htmlInstallDir /share/doc/en/html/hurricane ) set ( htmlInstallDir share/doc/en/html/hurricane )
set ( latexInstallDir /share/doc/en/latex/hurricane ) set ( latexInstallDir share/doc/en/latex/hurricane )
add_custom_target ( doc ALL cd ${HURRICANE_SOURCE_DIR}/doc/hurricane && ${DOXYGEN_EXECUTABLE} doxyfile ) add_custom_target ( doc ALL cd ${HURRICANE_SOURCE_DIR}/doc/hurricane && ${DOXYGEN_EXECUTABLE} doxyfile )

4
hurricane/doc/viewer/CMakeLists.txt
View File

@ -1,6 +1,6 @@
set ( htmlInstallDir /share/doc/en/html/viewer ) set ( htmlInstallDir share/doc/en/html/viewer )
set ( latexInstallDir /share/doc/en/latex/viewer ) set ( latexInstallDir share/doc/en/latex/viewer )
add_custom_target ( documentation ALL cd ${HURRICANE_SOURCE_DIR}/doc/viewer && ${DOXYGEN_EXECUTABLE} doxyfile ) add_custom_target ( documentation ALL cd ${HURRICANE_SOURCE_DIR}/doc/viewer && ${DOXYGEN_EXECUTABLE} doxyfile )

4
hurricane/src/hurricane/CMakeLists.txt
View File

@ -151,5 +151,5 @@
) )
add_library ( hurricane ${cpps} ) add_library ( hurricane ${cpps} )
install ( TARGETS hurricane DESTINATION /lib) install ( TARGETS hurricane DESTINATION lib)
install ( FILES ${includes} DESTINATION /include/hurricane ) install ( FILES ${includes} DESTINATION include/hurricane )

4
hurricane/src/isobar/CMakeLists.txt
View File

@ -92,5 +92,5 @@
) )
target_link_libraries ( Hurricane isobar hurricane ${PYTHON_LIBRARIES} ) target_link_libraries ( Hurricane isobar hurricane ${PYTHON_LIBRARIES} )
install ( TARGETS isobar DESTINATION /lib ) install ( TARGETS isobar DESTINATION lib )
install ( TARGETS Hurricane DESTINATION /lib/python ) install ( TARGETS Hurricane DESTINATION lib/python )

4
hurricane/src/viewer/CMakeLists.txt
View File

@ -109,11 +109,11 @@
qt4_wrap_cpp ( MOC_SRCS ${mocincludes} ) qt4_wrap_cpp ( MOC_SRCS ${mocincludes} )
qt4_add_resources ( RCC_SRCS CellViewer.qrc ) qt4_add_resources ( RCC_SRCS CellViewer.qrc )
install ( FILES ${exports} DESTINATION /include/hurricane/viewer ) install ( FILES ${exports} DESTINATION include/hurricane/viewer )
add_library ( viewer ${cpps} ${MOC_SRCS} ${RCC_SRCS} ) add_library ( viewer ${cpps} ${MOC_SRCS} ${RCC_SRCS} )
target_link_libraries ( viewer hurricane target_link_libraries ( viewer hurricane
${QT_LIBRARIES} ${QT_LIBRARIES}
# ${Boost_LIBRARIES} # ${Boost_LIBRARIES}
) )
install ( TARGETS viewer DESTINATION /lib ) install ( TARGETS viewer DESTINATION lib )