From 3af2b0694fc4d04cc4e0caa054b2ffeda879a913 Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Tue, 18 May 2010 12:52:57 +0000 Subject: [PATCH] * 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. --- vlsisapd/CMakeLists.txt | 2 +- vlsisapd/cmake_modules/CMakeLists.txt | 2 +- vlsisapd/cmake_modules/FindIO.cmake | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/vlsisapd/CMakeLists.txt b/vlsisapd/CMakeLists.txt index efe0df40..1c7e9d58 100644 --- a/vlsisapd/CMakeLists.txt +++ b/vlsisapd/CMakeLists.txt @@ -2,7 +2,7 @@ PROJECT(IO) CMAKE_MINIMUM_REQUIRED(VERSION 2.4.0) -LIST(INSERT CMAKE_MODULE_PATH 0 "${IO_SOURCE_DIR}/cmake_modules/") +LIST(INSERT CMAKE_MODULE_PATH 0 "${IO_SOURCE_DIR}/cmake/Modules/") FIND_PACKAGE(LibXml2 REQUIRED) diff --git a/vlsisapd/cmake_modules/CMakeLists.txt b/vlsisapd/cmake_modules/CMakeLists.txt index eab771c6..32a1e191 100644 --- a/vlsisapd/cmake_modules/CMakeLists.txt +++ b/vlsisapd/cmake_modules/CMakeLists.txt @@ -1 +1 @@ -install(FILES FindIO.cmake DESTINATION share/cmake_modules) +install(FILES FindIO.cmake DESTINATION share/cmake/Modules) diff --git a/vlsisapd/cmake_modules/FindIO.cmake b/vlsisapd/cmake_modules/FindIO.cmake index 602a57f3..d01ecae2 100644 --- a/vlsisapd/cmake_modules/FindIO.cmake +++ b/vlsisapd/cmake_modules/FindIO.cmake @@ -34,22 +34,22 @@ SETUP_SEARCH_DIR(IO) IF(IO_DIR_SEARCH) # AGDS - FIND_PATH (AGDS_INCLUDE_DIR NAMES io/agds/GdsLibrary.h PATHS ${IO_DIR_SEARCH} PATH_SUFFIXES include) + FIND_PATH (AGDS_INCLUDE_DIR NAMES agds/GdsLibrary.h PATHS ${IO_DIR_SEARCH} PATH_SUFFIXES include/io include) FIND_LIBRARY(AGDS_LIBRARY NAMES agds PATHS ${IO_DIR_SEARCH} PATH_SUFFIXES lib) SET_FOUND(AGDS) # CIF - FIND_PATH (CIF_INCLUDE_DIR NAMES io/cif/CifCircuit.h PATHS ${IO_DIR_SEARCH} PATH_SUFFIXES include) + FIND_PATH (CIF_INCLUDE_DIR NAMES cif/CifCircuit.h PATHS ${IO_DIR_SEARCH} PATH_SUFFIXES include/io include) FIND_LIBRARY(CIF_LIBRARY NAMES cif PATHS ${IO_DIR_SEARCH} PATH_SUFFIXES lib) SET_FOUND(CIF) # OPENCHAMS - FIND_PATH (OPENCHAMS_INCLUDE_DIR NAMES io/openChams/Circuit.h PATHS ${IO_DIR_SEARCH} PATH_SUFFIXES include) + FIND_PATH (OPENCHAMS_INCLUDE_DIR NAMES openChams/Circuit.h PATHS ${IO_DIR_SEARCH} PATH_SUFFIXES include/io include) FIND_LIBRARY(OPENCHAMS_LIBRARY NAMES openChams PATHS ${IO_DIR_SEARCH} PATH_SUFFIXES lib) SET_FOUND(OPENCHAMS) # DTR - FIND_PATH (DTR_INCLUDE_DIR NAMES io/dtr/Techno.h PATHS ${IO_DIR_SEARCH} PATH_SUFFIXES include) + FIND_PATH (DTR_INCLUDE_DIR NAMES dtr/Techno.h PATHS ${IO_DIR_SEARCH} PATH_SUFFIXES include/io include) FIND_LIBRARY(DTR_LIBRARY NAMES dtr PATHS ${IO_DIR_SEARCH} PATH_SUFFIXES lib) SET_FOUND(DTR)