From 6eaf32847cc104643a094113cb0dc134c09c7349 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Fri, 21 Feb 2020 09:34:23 +0100 Subject: [PATCH] CMake: move "flat install" for windows to the top of the file. --- CMakeLists.txt | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 18a61dd..b3057bc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,6 +20,12 @@ include(GNUInstallDirs) set( CMAKE_INSTALL_SHAREDIR ${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME} ) +if (WIN32) + # "Flat" install on windows. + set( CMAKE_INSTALL_BINDIR "." ) + set( CMAKE_INSTALL_DATADIR "." ) +endif (WIN32) + # -------------------------------- # Program # -------------------------------- @@ -106,10 +112,6 @@ if (WIN32) ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR} ) - # "Flat" install on windows. - set( CMAKE_INSTALL_BINDIR "." ) - set( CMAKE_INSTALL_DATADIR "." ) - # We also need to copy libcrypto dll during install install(FILES ${OPENSSL_LIBCRYPTO_DLL} DESTINATION ${CMAKE_INSTALL_BINDIR}) endif (WIN32)