Commit 3442beac authored by Kenneth Moreland's avatar Kenneth Moreland
Browse files

Changed the name of the libraries from icet_* to IceT*

Also changed icet to IceTCore.
parent 0e2e6161
......@@ -195,9 +195,10 @@ SET(ICET_LIBRARY_DIRS_CONFIG ${ICET_LIBRARY_DIR})
SET(ICET_USE_FILE_CONFIG ${ICET_SOURCE_DIR}/UseICET.cmake)
SET(ICET_BUILD_SETTINGS_FILE_CONFIG ${ICET_BINARY_DIR}/ICETBuildSettings.cmake)
SET(ICET_LIBRARY_DEPENDS_FILE ${ICET_BINARY_DIR}/ICETLibraryDepends.cmake)
GET_TARGET_PROPERTY(ICET_LIBRARY_FILE icet LOCATION)
GET_TARGET_PROPERTY(ICET_STRATEGIES_LIBRARY_FILE icet_strategies LOCATION)
GET_TARGET_PROPERTY(ICET_MPI_LIBRARY_FILE icet_mpi LOCATION)
GET_TARGET_PROPERTY(ICET_LIBRARY_FILE IceTCore LOCATION)
GET_TARGET_PROPERTY(ICET_STRATEGIES_LIBRARY_FILE IceTStrategies LOCATION)
GET_TARGET_PROPERTY(ICET_GL_LIBRARY_FILE IceTGL LOCATION)
GET_TARGET_PROPERTY(ICET_MPI_LIBRARY_FILE IceTMPI LOCATION)
CONFIGURE_FILE(${ICET_SOURCE_DIR}/ICETConfig.cmake.in
${ICET_BINARY_DIR}/ICETConfig.cmake @ONLY IMMEDIATE)
#Second, configuration for install directory.
......@@ -212,6 +213,8 @@ GET_FILENAME_COMPONENT(ICET_LIBRARY_FILE "${ICET_LIBRARY_FILE}" NAME)
SET(ICET_LIBRARY_FILE "${CMAKE_INSTALL_PREFIX}${ICET_INSTALL_LIB_DIR}/${ICET_LIBRARY_FILE}")
GET_FILENAME_COMPONENT(ICET_STRATEGIES_LIBRARY_FILE "${ICET_STRATEGIES_LIBRARY_FILE}" NAME)
SET(ICET_STRATEGIES_LIBRARY_FILE "${CMAKE_INSTALL_PREFIX}${ICET_INSTALL_LIB_DIR}/${ICET_STRATEGIES_LIBRARY_FILE}")
GET_FILENAME_COMPONENT(ICET_GL_LIBRARY_FILE "${ICET_GL_LIBRARY_FILE}" NAME)
SET(ICET_GL_LIBRARY_FILE "${CMAKE_INSTALL_PREFIX}${ICET_INSTALL_LIB_DIR}/${ICET_GL_LIBRARY_FILE}")
GET_FILENAME_COMPONENT(ICET_MPI_LIBRARY_FILE "${ICET_MPI_LIBRARY_FILE}" NAME)
SET(ICET_MPI_LIBRARY_FILE "${CMAKE_INSTALL_PREFIX}${ICET_INSTALL_LIB_DIR}/${ICET_MPI_LIBRARY_FILE}")
CONFIGURE_FILE(${ICET_SOURCE_DIR}/ICETConfig.cmake.in
......
......@@ -92,3 +92,6 @@ Changed IceTCommRequest from being an integer to being a pointer to a
structure. Besides the benefits of type safety, the old method assumed
that you would cast pointers to 32-bit integers, which quite simply would
not work on 64-bit machines.
Changed the names of the libraries from icet, icet_strategies, and icet_mpi
to IceTCore, IceTStrategies, and IceTMPI, respectively.
......@@ -2,8 +2,9 @@
#
# UseICET.cmake - File to INCLUDE in a CMakeLists.txt file to use IceT.
#
# After including this file, you need only to add icet, icet_strategies, and,
# perhaps, icet_mpi libraries with the LINK_LIBRARIES command.
# After including this file, you need only to add IceTCore, IceTStrategies,
# and, perhaps, IceTGL and IceTMPI libraries with the LINK_LIBRARIES
# command.
#
## Copyright 2003 Sandia Coporation
## Under the terms of Contract DE-AC04-94AL85000, there is a non-exclusive
......@@ -11,9 +12,6 @@
## Redistribution and use in source and binary forms, with or without
## modification, are permitted provided that this Notice and any statement
## of authorship are reproduced on all copies.
#
# Id
#
#Load compiler settings used for IceT.
#On second thought, why enforce the duplication of compiler flags?
......
# Id
#
## Copyright 2003 Sandia Coporation
## Under the terms of Contract DE-AC04-94AL85000, there is a non-exclusive
## license for use of this work by or on behalf of the U.S. Government.
......@@ -13,15 +11,15 @@ SET(ICET_MPI_SRCS
)
IF (ICET_USE_MPI)
ADD_LIBRARY(icet_mpi ${ICET_MPI_SRCS})
ADD_LIBRARY(IceTMPI ${ICET_MPI_SRCS})
TARGET_LINK_LIBRARIES(icet_mpi
icet
TARGET_LINK_LIBRARIES(IceTMPI
IceTCore
${ICET_MPI_LIBRARIES}
)
IF(NOT ICET_INSTALL_NO_LIBRARIES)
INSTALL(TARGETS icet_mpi
INSTALL(TARGETS IceTMPI
RUNTIME DESTINATION ${ICET_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${ICET_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${ICET_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries)
......@@ -29,7 +27,7 @@ IF (ICET_USE_MPI)
IF(NOT ICET_INSTALL_NO_DEVELOPMENT)
INSTALL(FILES ${ICET_SOURCE_DIR}/src/include/IceTMPI.h
DESTINATION ${ICET_INSTALL_INCLUDE_DIR})
INSTALL(TARGETS icet_mpi
INSTALL(TARGETS IceTMPI
DESTINATION ${ICET_INSTALL_LIB_DIR} COMPONENT Development)
ENDIF(NOT ICET_INSTALL_NO_DEVELOPMENT)
......
......@@ -12,15 +12,15 @@ SET(ICET_GL_SRCS
gl_image.c
)
ADD_LIBRARY(icet_gl ${ICET_GL_SRCS})
ADD_LIBRARY(IceTGL ${ICET_GL_SRCS})
TARGET_LINK_LIBRARIES(icet_gl
icet
TARGET_LINK_LIBRARIES(IceTGL
IceTCore
${ICET_OPENGL_LIBRARIES}
)
IF(NOT ICET_INSTALL_NO_LIBRARIES)
INSTALL(TARGETS icet_gl
INSTALL(TARGETS IceTGL
RUNTIME DESTINATION ${ICET_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${ICET_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${ICET_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries)
......
......@@ -17,10 +17,10 @@ SET(ICET_SRCS
image.c
)
ADD_LIBRARY(icet ${ICET_SRCS})
ADD_LIBRARY(IceTCore ${ICET_SRCS})
IF(NOT ICET_INSTALL_NO_LIBRARIES)
INSTALL(TARGETS icet
INSTALL(TARGETS IceTCore
RUNTIME DESTINATION ${ICET_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${ICET_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${ICET_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries)
......
......@@ -22,22 +22,22 @@
#endif
#if defined(WIN32) && defined(ICET_BUILD_SHARED_LIBS)
# ifdef icet_EXPORTS
# ifdef IceTCore_EXPORTS
# define ICET_EXPORT __declspec( dllexport )
# else
# define ICET_EXPORT __declspec( dllimport )
# endif
# ifdef icet_gl_EXPORTS
# ifdef IceTGL_EXPORTS
# define ICET_GL_EXPORT __declspec( dllexport )
# else
# define ICET_GL_EXPORT __declspec( dllimport )
# endif
# ifdef icet_strategies_EXPORTS
# ifdef IceTStrategies_EXPORTS
# define ICET_STRATEGY_EXPORT __declspec( dllexport )
# else
# define ICET_STRATEGY_EXPORT __declspec( dllimport )
# endif
# ifdef icet_mpi_EXPORTS
# ifdef IceTMPI_EXPORTS
# define ICET_MPI_EXPORT __declspec( dllexport )
# else
# define ICET_MPI_EXPORT __declspec( dllimport )
......
# Id
#
## Copyright 2003 Sandia Coporation
## Under the terms of Contract DE-AC04-94AL85000, there is a non-exclusive
## license for use of this work by or on behalf of the U.S. Government.
......@@ -17,12 +15,12 @@ SET(ICET_STRATEGIES_SRCS
vtree.c
)
ADD_LIBRARY(icet_strategies ${ICET_STRATEGIES_SRCS})
ADD_LIBRARY(IceTStrategies ${ICET_STRATEGIES_SRCS})
TARGET_LINK_LIBRARIES(icet_strategies icet)
TARGET_LINK_LIBRARIES(IceTStrategies IceTCore)
IF(NOT ICET_INSTALL_NO_LIBRARIES)
INSTALL(TARGETS icet_strategies
INSTALL(TARGETS IceTStrategies
RUNTIME DESTINATION ${ICET_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${ICET_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${ICET_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries)
......
......@@ -25,10 +25,10 @@ CREATE_TEST_SOURCELIST(Tests icetTests_mpi.c ${MyTests}
ADD_EXECUTABLE(icetTests_mpi ${Tests} ${UTIL_SRCS})
TARGET_LINK_LIBRARIES(icetTests_mpi
icet
icet_gl
icet_strategies
icet_mpi
IceTCore
IceTGL
IceTStrategies
IceTMPI
${OPENGL_glu_LIBRARY}
${GLUT_LIBRARIES}
)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment