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

* All Tools: 

- Change: New structure for the installation & CMake system.
         * Tools are now grouped in "projects". There are three projects:
           1. - IO: Standalones parsers/drivers (IO_USER_TOP, IO_TOP).
           2. - Coriolis: Base & digital tools (CORIOLIS_USER_TOP, CORIOLIS_TOP).
           3. - Chams: Analogic tools (CHAMS_USER_TOP, CHAMS_TOP).
           Each *project* has a two "TOP" environement variables, for
         example: IO_TOP and IO_USER_TOP. Thoses variables are the only
         ones useds to locate the tool (CMake modules, headers & libraries).
           The local path always takes precedence over the global one.
           The localisation process occurs in each tool top CMakeLists.txt
         where the macro SETUP_PROJECT_PATH is to be defined. There is no
         way to put it in a shared includes file as it's the macro precisely
         used to locates the includes... You have to call the macro once for
         each project you wants to uses:
             SETUP_PROJECT_PATHS(IO)
             SETUP_PROJECT_PATHS(CORIOLIS)
         * In FindTOOL.cmake, supress the <TOOL>_DIR_SEARCH and uses the
         <PROJECT>_DIR_SEARCH instead (example: CORIOLIS_DIR_SEARCH).
         * buildCoriolis.py modificated according to the new "TOP" scheme.
This commit is contained in:
Jean-Paul Chaput 2010-03-18 15:32:06 +00:00
parent 093baff9b6
commit 9c72b88210
2 changed files with 64 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vlsisapd/CMakeLists.txt
View File

@ -2,7 +2,7 @@ PROJECT(IO)
CMAKE_MINIMUM_REQUIRED(VERSION 2.4.0) CMAKE_MINIMUM_REQUIRED(VERSION 2.4.0)
SET(CMAKE_MODULE_PATH "${IO_SOURCE_DIR}/cmake_modules/") LIST(INSERT CMAKE_MODULE_PATH 0 "${IO_SOURCE_DIR}/cmake_modules/")
FIND_PACKAGE(LibXml2 REQUIRED) FIND_PACKAGE(LibXml2 REQUIRED)

5
vlsisapd/cmake_modules/FindIO.cmake
View File

@ -5,9 +5,9 @@
# IO_INCLUDE_DIR - the IO include directory # IO_INCLUDE_DIR - the IO include directory
# IO_LIBRARIES - The libraries needed to use IO # IO_LIBRARIES - The libraries needed to use IO
SET(IO_DIR_SEARCH $ENV{IO_TOP})
SET(IO_FOUND FALSE) SET(IO_FOUND FALSE)
IF(IO_DIR_SEARCH)
# AGDS # AGDS
FIND_PATH(AGDS_INCLUDE_DIR FIND_PATH(AGDS_INCLUDE_DIR
NAMES io/agds/GdsLibrary.h NAMES io/agds/GdsLibrary.h
@ -67,6 +67,7 @@ IF(AGDS_FOUND AND CIF_FOUND AND OPENCHAMS_FOUND)
ELSE(AGDS_FOUND AND CIF_FOUND AND OPENCHAMS_FOUND) ELSE(AGDS_FOUND AND CIF_FOUND AND OPENCHAMS_FOUND)
SET(IO_FOUND FALSE) SET(IO_FOUND FALSE)
ENDIF(AGDS_FOUND AND CIF_FOUND AND OPENCHAMS_FOUND) ENDIF(AGDS_FOUND AND CIF_FOUND AND OPENCHAMS_FOUND)
ENDIF(IO_DIR_SEARCH)
IF (NOT IO_FOUND) IF (NOT IO_FOUND)
SET(IO_MESSAGE SET(IO_MESSAGE