From ffe6cb4e2d5e39aa5e1b6ce6c6a690cd1b14df4f Mon Sep 17 00:00:00 2001 From: Rod Persky Date: Sun, 18 May 2014 00:03:47 +1000 Subject: [PATCH] remove old cmakelists from src/ --- src/CMake/CMakeLists.txt | 35 ------------------------------- src/CMake/src/CoolPropConfig.h | 3 --- src/CMake/src/CoolPropConfig.h.in | 3 --- src/CMake/src/CoolPropMain.cxx | 23 -------------------- 4 files changed, 64 deletions(-) delete mode 100644 src/CMake/CMakeLists.txt delete mode 100644 src/CMake/src/CoolPropConfig.h delete mode 100644 src/CMake/src/CoolPropConfig.h.in delete mode 100644 src/CMake/src/CoolPropMain.cxx diff --git a/src/CMake/CMakeLists.txt b/src/CMake/CMakeLists.txt deleted file mode 100644 index e8e25be5..00000000 --- a/src/CMake/CMakeLists.txt +++ /dev/null @@ -1,35 +0,0 @@ -cmake_minimum_required (VERSION 2.8) -project (CoolProp) - -# Offer the user the choice of overriding the directories -set (PROJECT_SRC_DIR src CACHE PATH "Project directory for source files") -set (PROJECT_BIN_DIR bin CACHE PATH "Build directory for executables") -set (PROJECT_LIB_DIR lib CACHE PATH "Build directory for libraries") -set (PROJECT_INC_DIR include CACHE PATH "Build directory for header files") - -# The version number. -set (CoolProp_VERSION_MAJOR 5) -set (CoolProp_VERSION_MINOR 0) -set (CoolProp_VERSION_PATCH 0) -set (CoolProp_VERSION ${CoolProp_VERSION_MAJOR}.${CoolProp_VERSION_MINOR}.${CoolProp_VERSION_PATCH}) - -FIND_PACKAGE(Git) -EXECUTE_PROCESS( - COMMAND ${GIT_EXECUTABLE} describe --match=CatchMeIfYouCan --always --abbrev=40 - OUTPUT_VARIABLE CoolProp_REVISION - OUTPUT_STRIP_TRAILING_WHITESPACE - ) - -# configure a header file to pass some of the CMake settings -# to the source code -configure_file ( - "${PROJECT_SRC_DIR}/CoolPropConfig.h.in" - "${PROJECT_SRC_DIR}/CoolPropConfig.h" - ) - -# add the binary tree to the search path for include files -# so that we will find CoolPropConfig.h -include_directories("${PROJECT_SRC_DIR}" "${PROJECT_BIN_DIR}" "${PROJECT_LIB_DIR}" "${PROJECT_INC_DIR}") - -# add the executable -add_executable(CoolProp ${PROJECT_SRC_DIR}/CoolPropMain.cpp) diff --git a/src/CMake/src/CoolPropConfig.h b/src/CMake/src/CoolPropConfig.h deleted file mode 100644 index 082c10d9..00000000 --- a/src/CMake/src/CoolPropConfig.h +++ /dev/null @@ -1,3 +0,0 @@ -// the configured options and settings for CoolProp -#define CoolProp_VERSION "5.0.0" -#define CoolProp_REVISION "" diff --git a/src/CMake/src/CoolPropConfig.h.in b/src/CMake/src/CoolPropConfig.h.in deleted file mode 100644 index 7d49e71c..00000000 --- a/src/CMake/src/CoolPropConfig.h.in +++ /dev/null @@ -1,3 +0,0 @@ -// the configured options and settings for CoolProp -#define CoolProp_VERSION "@CoolProp_VERSION@" -#define CoolProp_REVISION "${CoolProp_REVISION}" \ No newline at end of file diff --git a/src/CMake/src/CoolPropMain.cxx b/src/CMake/src/CoolPropMain.cxx deleted file mode 100644 index c67467bd..00000000 --- a/src/CMake/src/CoolPropMain.cxx +++ /dev/null @@ -1,23 +0,0 @@ -// A simple program that computes the square root of a number -#include -#include -#include -#include "CoolPropConfig.h" - -int main (int argc, char *argv[]) -{ - if (argc < 2) - { - fprintf(stdout,"%s Version %s (%s)\n", - argv[0], - CoolProp_VERSION, - CoolProp_REVISION); - fprintf(stdout,"Usage: %s number\n",argv[0]); - return 1; - } - double inputValue = atof(argv[1]); - double outputValue = sqrt(inputValue); - fprintf(stdout,"The square root of %g is %g\n", - inputValue, outputValue); - return 0; -}