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

* All tools: 

- Change: Adaptation to cmake 2.8. No more "add_subdirectory()" when
       the sub directory doesn't hold a CMakeList.txt.
         For "add_definition()", set policy 00005 to NEW.
   - Change: Integrate IO extenal libraries.
   - Change: Small compatibilities between "size_t" and "unsigned int"
       under 64 bits.
   - Change: Temporarily disable Equinox/Solstice in unicorn.
This commit is contained in:
The Coriolis Project 2010-03-11 16:01:21 +00:00
parent edd85db787
commit 6d651529b0
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
unicorn/CMakeLists.txt
View File

@ -36,13 +36,14 @@ SET(QT_USE_QTXML "true")
FIND_PACKAGE(Boost 1.33.1 COMPONENTS program_options REQUIRED)
FIND_PACKAGE(Qt4 REQUIRED) # find and setup Qt4 for this project
FIND_PACKAGE(LEFDEF REQUIRED)
FIND_PACKAGE(IO REQUIRED)
FIND_PACKAGE(HURRICANE REQUIRED)
FIND_PACKAGE(CORIOLIS REQUIRED)
FIND_PACKAGE(KNIK REQUIRED)
FIND_PACKAGE(KATABATIC REQUIRED)
FIND_PACKAGE(KITE REQUIRED)
FIND_PACKAGE(EQUINOX REQUIRED)
FIND_PACKAGE(SOLSTICE REQUIRED)
#FIND_PACKAGE(EQUINOX REQUIRED)
#FIND_PACKAGE(SOLSTICE REQUIRED)
SET_LIB_LINK_MODE()

11
unicorn/src/CMakeLists.txt
View File

@ -4,7 +4,6 @@
${HURRICANE_INCLUDE_DIR}
${CORIOLIS_INCLUDE_DIR}
)
link_directories ( . )
set ( mocincludes unicorn/UnicornGui.h
unicorn/COpenCellDialog.h
@ -18,10 +17,10 @@
qt4_add_resources ( RCC_SRCS Unicorn.qrc )
add_library ( unicorn ${cpps} ${MOCcpps} )
target_link_libraries ( unicorn ${SOLSTICE_GRAPHICAL_LIBRARIES}
${SOLSTICE_LIBRARIES}
${EQUINOX_GRAPHICAL_LIBRARIES}
${EQUINOX_LIBRARIES}
target_link_libraries ( unicorn #${SOLSTICE_GRAPHICAL_LIBRARIES}
#${SOLSTICE_LIBRARIES}
#${EQUINOX_GRAPHICAL_LIBRARIES}
#${EQUINOX_LIBRARIES}
${KITE_GRAPHICAL_LIBRARIES}
${KITE_LIBRARIES}
${KATABATIC_GRAPHICAL_LIBRARIES}
@ -31,6 +30,8 @@
${CORIOLIS_LIBRARIES}
${HURRICANE_GRAPHICAL_LIBRARIES}
${HURRICANE_LIBRARIES}
${AGDS_LIBRARY}
${CIF_LIBRARY}
${LEFDEF_LIBRARIES}
${OA_LIBRARIES}
${QT_LIBRARIES}