diff --git a/cnes/src/CMakeLists.txt b/cnes/src/CMakeLists.txt index 4dffcd2..eeeb44c 100644 --- a/cnes/src/CMakeLists.txt +++ b/cnes/src/CMakeLists.txt @@ -8,7 +8,6 @@ include(OssimUtilities) find_package(TIFF) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${OPENTHREADS_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${TIFF_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${GEOTIFF_INCLUDE_DIR}) diff --git a/gdal/src/CMakeLists.txt b/gdal/src/CMakeLists.txt index b8de135..50f5ef8 100644 --- a/gdal/src/CMakeLists.txt +++ b/gdal/src/CMakeLists.txt @@ -36,7 +36,6 @@ MESSAGE( STATUS "SQLITE_LIBRARY = ${SQLITE_LIBRARY}" ) MESSAGE( STATUS "PROJ4_LIBRARY = ${PROJ4_LIBRARY}" ) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -INCLUDE_DIRECTORIES(${OPENTHREADS_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${GDAL_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${TIFF_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${GEOTIFF_INCLUDE_DIR}) @@ -78,7 +77,7 @@ endif() OSSIM_LINK_LIBRARY(${LIB_NAME} COMPONENT_NAME ossim TYPE "${OSSIM_PLUGIN_LINK_TYPE}" - LIBRARIES ${OSSIM_LIBRARIES} ${OPENTHREADS_LIBRARY} ${GDAL_LIBRARY} ${KAKADU_LIBRARY} ${KAKADU_AUX_LIBRARY} ${KAKADU_ADDITIONAL_OBJS} ${TIFF_LIBRARY} ${CURL_LIBRARY} ${PROJ4_LIBRARY} ${SQLITE_LIBRARY} ${EXPAT_LIBRARIES} ${ZLIB_LIBRARY} ${GEOTIFF_LIBRARY} + LIBRARIES ${OSSIM_LIBRARIES} ${GDAL_LIBRARY} ${KAKADU_LIBRARY} ${KAKADU_AUX_LIBRARY} ${KAKADU_ADDITIONAL_OBJS} ${TIFF_LIBRARY} ${CURL_LIBRARY} ${PROJ4_LIBRARY} ${SQLITE_LIBRARY} ${EXPAT_LIBRARIES} ${ZLIB_LIBRARY} ${GEOTIFF_LIBRARY} HEADERS "${OSSIMPLUGIN_HEADERS}" SOURCE_FILES "${OSSIMPLUGIN_SRCS}" INSTALL_LIB)