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:34:02 +00:00
parent f8d79dc53e
commit c61f191a61
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crlcore/cmake_modules/CMakeLists.txt
View File

@ -1,4 +1,4 @@
install ( FILES FindCORIOLIS.cmake install ( FILES FindCORIOLIS.cmake
FindOPENACCESS.cmake FindOPENACCESS.cmake
FindLEFDEF.cmake FindLEFDEF.cmake
DESTINATION /share/cmake_modules ) DESTINATION share/cmake_modules )

14
crlcore/etc/CMakeLists.txt
View File

@ -1,7 +1,7 @@
install ( FILES environment.alliance.xml DESTINATION /share/etc ) install ( FILES environment.alliance.xml DESTINATION share/etc )
install ( FILES technology.symbolic.xml DESTINATION /share/etc ) install ( FILES technology.symbolic.xml DESTINATION share/etc )
install ( FILES technology.hcmos9.s2r.xml DESTINATION /share/etc ) install ( FILES technology.hcmos9.s2r.xml DESTINATION share/etc )
install ( FILES technology.cmos065.s2r.xml DESTINATION /share/etc ) install ( FILES technology.cmos065.s2r.xml DESTINATION share/etc )
install ( FILES technology.freePDK45.s2r.xml DESTINATION /share/etc ) install ( FILES technology.freePDK45.s2r.xml DESTINATION share/etc )
install ( FILES technology.fake.s2r.xml DESTINATION /share/etc ) install ( FILES technology.fake.s2r.xml DESTINATION share/etc )
install ( FILES display.xml DESTINATION /share/etc ) install ( FILES display.xml DESTINATION share/etc )

4
crlcore/src/ccore/CMakeLists.txt
View File

@ -209,7 +209,7 @@
qt4_wrap_cpp ( moc_cpps ${mocincludes} ) qt4_wrap_cpp ( moc_cpps ${mocincludes} )
install ( FILES ${includes} ${mocincludes} DESTINATION /include/coriolis/crlcore ) install ( FILES ${includes} ${mocincludes} DESTINATION include/coriolis/crlcore )
add_library ( crlcore ${ccore_cpps} add_library ( crlcore ${ccore_cpps}
${moc_cpps} ${moc_cpps}
@ -237,4 +237,4 @@
${AGDS_LIBRARY} ${AGDS_LIBRARY}
${CIF_LIBRARY} ${CIF_LIBRARY}
) )
install ( TARGETS crlcore DESTINATION /lib ) install ( TARGETS crlcore DESTINATION lib )

2
crlcore/src/cyclop/CMakeLists.txt
View File

@ -26,5 +26,5 @@
${OA_LIBRARIES} ${OA_LIBRARIES}
${QT_LIBRARIES} ${QT_LIBRARIES}
${Boost_LIBRARIES} ) ${Boost_LIBRARIES} )
install ( TARGETS cyclop DESTINATION /bin ) install ( TARGETS cyclop DESTINATION bin )

2
crlcore/src/x2y/CMakeLists.txt
View File

@ -16,4 +16,4 @@
${OA_LIBRARIES} ${OA_LIBRARIES}
${QT_LIBRARIES} ${QT_LIBRARIES}
${Boost_LIBRARIES} ) ${Boost_LIBRARIES} )
install ( TARGETS cx2y DESTINATION /bin ) install ( TARGETS cx2y DESTINATION bin )