From kde-commits Mon Nov 22 20:00:03 2010 From: =?utf-8?q?Peter=20K=C3=BCmmel?= Date: Mon, 22 Nov 2010 20:00:03 +0000 To: kde-commits Subject: branches/work/kst/portto4/kst/misc/getdata-windows/cmake Message-Id: <20101122200003.6B0E0AC8A2 () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=129045605110653 SVN commit 1199817 by kuemmel: getdata cmake updates M +5 -1 CMakeLists.txt M +9 -9 src/CMakeLists.txt --- branches/work/kst/portto4/kst/misc/getdata-windows/cmake/CMakeLists.txt #1199816:1199817 @@ -8,7 +8,9 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) +if(NOT GETDATA_DIR) set(GETDATA_DIR ${CMAKE_SOURCE_DIR}/..) +endif() macro(GD_FILES name folder) @@ -35,6 +37,8 @@ -Dssize_t=size_t -DGD_USE_CPP -DHAVE_STDINT_H + -DGD_NO_C99_API + #-DGD_C89_API ) set(CMAKE_DEBUG_POSTFIX d) configure_file(inttypes.h ${CMAKE_CURRENT_BINARY_DIR}/inttypes.h COPYONLY) @@ -73,7 +77,7 @@ endif() add_subdirectory(src) -add_subdirectory(bindings) +#add_subdirectory(bindings) --- branches/work/kst/portto4/kst/misc/getdata-windows/cmake/src/CMakeLists.txt #1199816:1199817 @@ -14,20 +14,20 @@ #${GETDATA_DIR}/src/ascii.c ${GETDATA_DIR}/src/${BZIP2_C} #${GETDATA_DIR}/src/close.c - ${GETDATA_DIR}/src/common.c - ${GETDATA_DIR}/src/compat.c + #${GETDATA_DIR}/src/common.c + #${GETDATA_DIR}/src/compat.c #${GETDATA_DIR}/src/constant.c ${GETDATA_DIR}/src/${DEBUG_C} #${GETDATA_DIR}/src/del.c #${GETDATA_DIR}/src/encoding.c - #${GETDATA_DIR}/src/endian.c - #${GETDATA_DIR}/src/entry.c + ${GETDATA_DIR}/src/endian.c + ${GETDATA_DIR}/src/entry.c ${GETDATA_DIR}/src/errors.c #config.h needed - #${GETDATA_DIR}/src/field_list.c - #${GETDATA_DIR}/src/flimits.c - #${GETDATA_DIR}/src/flush.c - #${GETDATA_DIR}/src/fragment.c - #${GETDATA_DIR}/src/getdata.c + ${GETDATA_DIR}/src/field_list.c + ${GETDATA_DIR}/src/flimits.c + ${GETDATA_DIR}/src/flush.c + ${GETDATA_DIR}/src/fragment.c + ${GETDATA_DIR}/src/getdata.c ${GETDATA_DIR}/src/globals.c ${GETDATA_DIR}/src/${GZIP_C} ${GETDATA_DIR}/src/index.c