From 2604243293def0892e4b746a65cdbc5db200abb5 Mon Sep 17 00:00:00 2001 From: Luke Street Date: Sun, 18 Apr 2021 21:23:42 -0400 Subject: [PATCH] Remove Windows cmake dir conditional --- CMakeLists.txt | 6 +----- atdna/CMakeLists.txt | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8cb0e4a..d3bbe43 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -317,11 +317,7 @@ set(ATHENA_ICO ${CMAKE_CURRENT_SOURCE_DIR}/Athena.ico) # Offer the user the choice of overriding the installation directories set(INSTALL_LIB_DIR lib CACHE PATH "Installation directory for libraries") set(INSTALL_INCLUDE_DIR include CACHE PATH "Installation directory for header files") -if(WIN32 AND NOT CYGWIN) - set(INSTALL_CMAKE_DIR cmake) -else() - set(INSTALL_CMAKE_DIR lib/cmake/athena) -endif() +set(INSTALL_CMAKE_DIR lib/cmake/athena) # Make relative paths absolute (needed later on) foreach(p LIB INCLUDE CMAKE) diff --git a/atdna/CMakeLists.txt b/atdna/CMakeLists.txt index 7707947..ca86631 100644 --- a/atdna/CMakeLists.txt +++ b/atdna/CMakeLists.txt @@ -64,11 +64,7 @@ endif() # Offer the user the choice of overriding the installation directories set(INSTALL_INCLUDE_DIR include CACHE PATH "Installation directory for header files") set(INSTALL_BIN_DIR bin CACHE PATH "Installation directory for executables") -if(WIN32 AND NOT CYGWIN) - set(INSTALL_CMAKE_DIR cmake) -else() - set(INSTALL_CMAKE_DIR lib/cmake/atdna) -endif() +set(INSTALL_CMAKE_DIR lib/cmake/atdna) # Make relative paths absolute (needed later on) foreach(p BIN INCLUDE CMAKE)