From 3415f0804969a5c66bc6793d7fc1feb3a627a9c4 Mon Sep 17 00:00:00 2001 From: "C. J. Howard" Date: Thu, 2 Jul 2020 11:45:14 -0400 Subject: [PATCH] Remove bin and dist directories from repo --- .gitignore | 3 +++ CMakeLists.txt | 4 ++++ README.md | 2 +- bin/.gitignore | 2 -- dist/.gitignore | 2 -- modules/.gitignore | 1 - 6 files changed, 8 insertions(+), 6 deletions(-) create mode 100644 .gitignore delete mode 100644 bin/.gitignore delete mode 100644 dist/.gitignore delete mode 100644 modules/.gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..efb36e7 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +bin +dist +modules/vmq \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 9357425..8bc3f7e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,6 +24,10 @@ set(PACKAGE_FILENAME ${PACKAGE_NAME}-${PACKAGE_VERSION}-${PACKAGE_PLATFORM}) set(PACKAGE_INSTALL_DIR ${CMAKE_SOURCE_DIR}/bin/${PACKAGE_BUILD_TYPE}/${PACKAGE_FILENAME}) set(PACKAGE_DIST_DIR ${CMAKE_SOURCE_DIR}/dist/${PACKAGE_BUILD_TYPE}) +# Create output directories +file(MAKE_DIRECTORY ${PACKAGE_INSTALL_DIR}) +file(MAKE_DIRECTORY ${PACKAGE_DIST_DIR}) + # Check for architecture mismatches if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "4") if (PACKAGE_PLATFORM MATCHES "64$") diff --git a/README.md b/README.md index 23717a2..98244ca 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ The following arguments may be passed to CMake during configuration: ### GNU/Linux -Building for GNU/Linux requires CMake, GCC, G++, and GNU Make. Open a terminal in either the `build/linux32` or `build/linux64` directory and run the following commands: +Building for GNU/Linux requires CMake, GCC, G++, and GNU Make. Navigate to either the `build/linux32` or `build/linux64` directory and run the following commands: cmake ../.. -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=... cmake --build . diff --git a/bin/.gitignore b/bin/.gitignore deleted file mode 100644 index c96a04f..0000000 --- a/bin/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore \ No newline at end of file diff --git a/dist/.gitignore b/dist/.gitignore deleted file mode 100644 index c96a04f..0000000 --- a/dist/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore \ No newline at end of file diff --git a/modules/.gitignore b/modules/.gitignore deleted file mode 100644 index af71101..0000000 --- a/modules/.gitignore +++ /dev/null @@ -1 +0,0 @@ -vmq \ No newline at end of file