* 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:
parent
f8d79dc53e
commit
c61f191a61
|
@ -1,4 +1,4 @@
|
|||
install ( FILES FindCORIOLIS.cmake
|
||||
FindOPENACCESS.cmake
|
||||
FindLEFDEF.cmake
|
||||
DESTINATION /share/cmake_modules )
|
||||
DESTINATION share/cmake_modules )
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
install ( FILES environment.alliance.xml DESTINATION /share/etc )
|
||||
install ( FILES technology.symbolic.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.freePDK45.s2r.xml DESTINATION /share/etc )
|
||||
install ( FILES technology.fake.s2r.xml DESTINATION /share/etc )
|
||||
install ( FILES display.xml DESTINATION /share/etc )
|
||||
install ( FILES environment.alliance.xml DESTINATION share/etc )
|
||||
install ( FILES technology.symbolic.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.freePDK45.s2r.xml DESTINATION share/etc )
|
||||
install ( FILES technology.fake.s2r.xml DESTINATION share/etc )
|
||||
install ( FILES display.xml DESTINATION share/etc )
|
||||
|
|
|
@ -209,7 +209,7 @@
|
|||
|
||||
|
||||
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}
|
||||
${moc_cpps}
|
||||
|
@ -237,4 +237,4 @@
|
|||
${AGDS_LIBRARY}
|
||||
${CIF_LIBRARY}
|
||||
)
|
||||
install ( TARGETS crlcore DESTINATION /lib )
|
||||
install ( TARGETS crlcore DESTINATION lib )
|
||||
|
|
|
@ -26,5 +26,5 @@
|
|||
${OA_LIBRARIES}
|
||||
${QT_LIBRARIES}
|
||||
${Boost_LIBRARIES} )
|
||||
install ( TARGETS cyclop DESTINATION /bin )
|
||||
install ( TARGETS cyclop DESTINATION bin )
|
||||
|
||||
|
|
|
@ -16,4 +16,4 @@
|
|||
${OA_LIBRARIES}
|
||||
${QT_LIBRARIES}
|
||||
${Boost_LIBRARIES} )
|
||||
install ( TARGETS cx2y DESTINATION /bin )
|
||||
install ( TARGETS cx2y DESTINATION bin )
|
||||
|
|
Loading…
Reference in New Issue