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

* All tools: 

- Change: adopt a tree layout compliant with the UNIX FHS.
        * includes under      TOP/include/coriolis2.
        * shared datas under  TOP/shared/coriolis2.
        * docs under          TOP/share/doc/coriolis2.
        * configuration under TOP/etc/coriolis2

  * ./crlcore:
    - Change: In Environment, comply to the new tree layout, search configuration
        files under TOP/etc/coriolis2/.

  * ./knik:
    - Change: In flute, comply to the new tree layout, get the "POW*.dat" files
        from TOP/share/coriolis2/flute-2.4.
This commit is contained in:
Jean-Paul Chaput 2010-05-18 12:53:00 +00:00
parent 3af2b0694f
commit 4db3b0b3de
8 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hurricane/cmake_modules/CMakeLists.txt
View File

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

6
hurricane/cmake_modules/FindHURRICANE.cmake
View File

@ -87,7 +87,7 @@ IF(UNIX)
FIND_PATH(HURRICANE_INCLUDE_PATH NAMES hurricane/Cell.h PATHS FIND_PATH(HURRICANE_INCLUDE_PATH NAMES hurricane/Cell.h PATHS
# Look in other places. # Look in other places.
${CORIOLIS_DIR_SEARCH} ${CORIOLIS_DIR_SEARCH}
PATH_SUFFIXES include PATH_SUFFIXES include/coriolis2 include
# Help the user find it if we cannot. # Help the user find it if we cannot.
DOC "${HURRICANE_INCLUDE_PATH_DESCRIPTION}" DOC "${HURRICANE_INCLUDE_PATH_DESCRIPTION}"
) )
@ -103,7 +103,7 @@ IF(UNIX)
FIND_PATH(HURRICANE_VIEWER_INCLUDE_PATH FIND_PATH(HURRICANE_VIEWER_INCLUDE_PATH
NAMES hurricane/viewer/CellWidget.h NAMES hurricane/viewer/CellWidget.h
PATHS ${CORIOLIS_DIR_SEARCH} PATHS ${CORIOLIS_DIR_SEARCH}
PATH_SUFFIXES include PATH_SUFFIXES include/coriolis2 include
# Help the user find it if we cannot. # Help the user find it if we cannot.
DOC "${HURRICANE_LIBRARY_PATH_DESCRIPTION}" DOC "${HURRICANE_LIBRARY_PATH_DESCRIPTION}"
) )
@ -119,7 +119,7 @@ IF(UNIX)
FIND_PATH(HURRICANE_PYTHON_INCLUDE_PATH FIND_PATH(HURRICANE_PYTHON_INCLUDE_PATH
NAMES hurricane/isobar/PyCell.h NAMES hurricane/isobar/PyCell.h
PATHS ${CORIOLIS_DIR_SEARCH} PATHS ${CORIOLIS_DIR_SEARCH}
PATH_SUFFIXES include PATH_SUFFIXES include/coriolis2 include
# Help the user find it if we cannot. # Help the user find it if we cannot.
DOC "${HURRICANE_LIBRARY_PATH_DESCRIPTION}" DOC "${HURRICANE_LIBRARY_PATH_DESCRIPTION}"
) )

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

@ -1,6 +1,6 @@
set ( htmlInstallDir share/doc/en/html/hurricane ) set ( htmlInstallDir share/doc/coriolis2/en/html/hurricane )
set ( latexInstallDir share/doc/en/latex/hurricane ) set ( latexInstallDir share/doc/coriolis2/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/coriolis2/en/html/viewer )
set ( latexInstallDir share/doc/en/latex/viewer ) set ( latexInstallDir share/doc/coriolis2/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 )

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

@ -152,4 +152,4 @@
add_library ( hurricane ${cpps} ) add_library ( hurricane ${cpps} )
install ( TARGETS hurricane DESTINATION lib${LIB_SUFFIX} ) install ( TARGETS hurricane DESTINATION lib${LIB_SUFFIX} )
install ( FILES ${includes} DESTINATION include/hurricane ) install ( FILES ${includes} DESTINATION include/coriolis2/hurricane )

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

@ -80,7 +80,7 @@
) )
install ( FILES ${includes} DESTINATION include/hurricane/isobar ) install ( FILES ${includes} DESTINATION include/coriolis2/hurricane/isobar )
add_library ( isobar ${sources} ) add_library ( isobar ${sources} )
target_link_libraries ( isobar hurricane ${PYTHON_LIBRARIES} -lutil ) target_link_libraries ( isobar hurricane ${PYTHON_LIBRARIES} -lutil )

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

@ -109,7 +109,7 @@
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/coriolis2/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

4
hurricane/src/viewer/RecordModel.cpp
View File

@ -126,9 +126,9 @@ namespace Hurricane {
} }
if ( role == Qt::DisplayRole ) { if ( role == Qt::DisplayRole ) {
int row = index.row (); int row = index.row ();
//Slot* slot = _record->getSlot ( row ); //Slot* slot = _record->getSlot ( row );
if ( row < _cache.size() ) { if ( row < (int)_cache.size() ) {
switch ( index.column() ) { switch ( index.column() ) {
case 0: return _cache[row].first; case 0: return _cache[row].first;
case 1: return _cache[row].second; case 1: return _cache[row].second;