72 lines
2.4 KiB
Diff
72 lines
2.4 KiB
Diff
From f0f1c0565a3d61185422fa55456c18e4489ea361 Mon Sep 17 00:00:00 2001
|
|
From: StableAgOH <stagoh@qq.com>
|
|
Date: Wed, 6 Sep 2023 22:55:23 +0800
|
|
Subject: [PATCH] Fix CMake install
|
|
|
|
---
|
|
AStyle/build/cmake/InstallOptions.cmake | 6 +++---
|
|
AStyle/build/cmake/OutputFiles.cmake | 8 ++++----
|
|
2 files changed, 7 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/AStyle/build/cmake/InstallOptions.cmake b/AStyle/build/cmake/InstallOptions.cmake
|
|
index 7b0ca7a..392bceb 100644
|
|
--- a/AStyle/build/cmake/InstallOptions.cmake
|
|
+++ b/AStyle/build/cmake/InstallOptions.cmake
|
|
@@ -4,11 +4,11 @@
|
|
# This may be modified by -DCMAKE_INSTALL_PREFIX=
|
|
# Default Win32 install prefix is not used (C:/Program Files (x86))
|
|
if(BUILD_SHARED_LIBS OR BUILD_STATIC_LIBS)
|
|
- if(NOT WIN32)
|
|
+ if(NOT MSVC)
|
|
install(TARGETS astyle DESTINATION lib)
|
|
endif()
|
|
else()
|
|
- if(WIN32)
|
|
+ if(MSVC)
|
|
set(pf86 "PROGRAMFILES(x86)")
|
|
set(prog_files $ENV{${pf86}})
|
|
if(NOT ${prog_files})
|
|
@@ -27,6 +27,6 @@ else()
|
|
endif()
|
|
install(TARGETS astyle DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
|
|
install(FILES ${DOCS} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/doc/astyle/html")
|
|
- INSTALL(FILES ${MAN} DESTINATION "${CMAKE_INSTALL_PREFIX}/man/man1")
|
|
+ INSTALL(FILES ${MAN} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man1")
|
|
endif()
|
|
endif()
|
|
diff --git a/AStyle/build/cmake/OutputFiles.cmake b/AStyle/build/cmake/OutputFiles.cmake
|
|
index 1336fa3..43dc534 100644
|
|
--- a/AStyle/build/cmake/OutputFiles.cmake
|
|
+++ b/AStyle/build/cmake/OutputFiles.cmake
|
|
@@ -1,23 +1,23 @@
|
|
# Set output file names if different than 'astyle'
|
|
if(BUILD_JAVA_LIBS)
|
|
- if(WIN32)
|
|
+ if(MSVC)
|
|
set_property(TARGET astyle PROPERTY OUTPUT_NAME AStyle32j)
|
|
set_property(TARGET astyle PROPERTY PREFIX "")
|
|
else()
|
|
set_property(TARGET astyle PROPERTY OUTPUT_NAME astylej)
|
|
endif()
|
|
elseif(BUILD_SHARED_LIBS)
|
|
- if(WIN32)
|
|
+ if(MSVC)
|
|
set_property(TARGET astyle PROPERTY OUTPUT_NAME AStyle32)
|
|
set_property(TARGET astyle PROPERTY PREFIX "")
|
|
endif()
|
|
elseif(BUILD_STATIC_LIBS)
|
|
- if(WIN32)
|
|
+ if(MSVC)
|
|
set_property(TARGET astyle PROPERTY OUTPUT_NAME AStyleLib)
|
|
set_property(TARGET astyle PROPERTY PREFIX "")
|
|
endif()
|
|
else()
|
|
- if(WIN32)
|
|
+ if(MSVC)
|
|
set_property(TARGET astyle PROPERTY OUTPUT_NAME AStyle)
|
|
endif()
|
|
endif()
|
|
--
|
|
2.41.0.windows.1
|
|
|