| 12
 3
 4
 5
 6
 7
 8
 9
 10
 11
 12
 13
 14
 15
 16
 17
 18
 19
 20
 21
 22
 23
 24
 25
 26
 27
 28
 29
 30
 31
 32
 33
 34
 35
 36
 37
 38
 39
 40
 41
 42
 43
 44
 45
 46
 47
 48
 49
 50
 51
 52
 53
 54
 55
 56
 57
 58
 59
 60
 61
 62
 63
 64
 65
 66
 67
 68
 69
 70
 71
 72
 73
 74
 75
 76
 77
 78
 79
 80
 81
 82
 83
 84
 85
 86
 87
 88
 89
 90
 91
 92
 93
 94
 95
 96
 97
 98
 99
 100
 101
 102
 103
 104
 105
 106
 107
 108
 109
 110
 111
 112
 113
 114
 115
 116
 117
 118
 119
 120
 121
 122
 123
 124
 125
 126
 127
 128
 129
 130
 131
 132
 133
 134
 135
 136
 137
 138
 139
 140
 141
 142
 143
 144
 145
 146
 147
 148
 149
 150
 151
 152
 153
 154
 155
 156
 157
 158
 159
 160
 161
 162
 163
 164
 165
 166
 167
 168
 169
 170
 171
 172
 173
 174
 175
 176
 177
 178
 179
 180
 181
 182
 183
 184
 185
 186
 187
 188
 189
 190
 191
 192
 193
 194
 195
 196
 197
 198
 199
 200
 201
 202
 203
 204
 205
 206
 207
 
 | Description: Enables building executable, shared and java libs in one pass
Author: Matteo Cypriani <mcy@lm7.fr>
Forwarded: no
Last-Update: 2025-10-26
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,6 +7,7 @@
 project(astyle CXX)
 
 # Build Options - executable by default, libraries on request
+option(BUILD_EXECUTABLE  "Build astyle binary"  ON)
 option(BUILD_JAVA_LIBS   "Build java library"   OFF)
 option(BUILD_SHARED_LIBS "Build shared library" OFF)
 option(BUILD_STATIC_LIBS "Build static library" OFF)
@@ -38,58 +39,59 @@
 list(APPEND MAN
     man/astyle.1)
 
-# Define java as a shared library
- if(BUILD_JAVA_LIBS)
-    set(BUILD_SHARED_LIBS ON)
- endif()
-
- # Define the output type
- if(BUILD_SHARED_LIBS OR BUILD_STATIC_LIBS)
-    add_library(astyle ${SRCS})
-else()
-    add_executable(astyle ${SRCS})
-endif()
-
 
 # compiler options:
 
 if(APPLE)
-    target_compile_options( astyle PRIVATE -W -Wall -fno-rtti -fno-exceptions -stdlib=libc++)
+    set(COMPILE_OPTS -W -Wall -fno-rtti -fno-exceptions -stdlib=libc++)
 elseif(NOT WIN32)   # Linux
-    target_compile_options(astyle PRIVATE -Wall -Wextra -fno-rtti -fno-exceptions)
+    set(COMPILE_OPTS -Wall -Wextra -fno-rtti -fno-exceptions)
     if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "gnu")
         execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
 
 	elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel" AND CMAKE_BUILD_TYPE STREQUAL "Release")
         # remove intel remarks for release build
-        target_compile_options(astyle PRIVATE -wd11074,11076)
+        set(COMPILE_OPTS ${COMPILE_OPTS} -wd11074,11076)
     endif()
 elseif(MINGW)
-    target_compile_options(astyle PRIVATE -Wall -Wextra -fno-rtti -fno-exceptions)
+    set(COMPILE_OPTS -Wall -Wextra -fno-rtti -fno-exceptions)
 elseif(BORLAND)     # Release must be explicitly requested for Borland
-    target_compile_options(astyle PRIVATE -q -w -x-)   # Cannot use no-rtti (-RT-)
+    set(COMPILE_OPTS -q -w -x-)   # Cannot use no-rtti (-RT-)
 elseif(MSVC)        # Visual Studio
-    target_compile_options(astyle PRIVATE /utf-8)
+    set(COMPILE_OPTS /utf-8)
 endif()
 
-# Set build-specific compile options
-if(BUILD_SHARED_LIBS OR BUILD_STATIC_LIBS)
-    if(BUILD_JAVA_LIBS)
-        find_package(JNI)
-        if (NOT JNI_FOUND)
-            set(err_jni "Use '-DJAVA_HOME=<JNI Directory>' to define the Java path")
-            message(FATAL_ERROR ${err_jni})
-        endif()
-        target_compile_options(astyle PRIVATE -DASTYLE_JNI)
-        target_include_directories(astyle PRIVATE ${JNI_INCLUDE_DIRS})
-    else()
-        target_compile_options(astyle PRIVATE -DASTYLE_LIB)
+if(BUILD_JAVA_LIBS)
+    add_library(astyle_javalib ${SRCS})
+    target_compile_options(astyle_javalib PRIVATE ${COMPILE_OPTS})
+    find_package(JNI)
+    if (NOT JNI_FOUND)
+        set(err_jni "Use '-DJAVA_HOME=<JNI Directory>' to define the Java path")
+        message(FATAL_ERROR ${err_jni})
     endif()
+    target_compile_options(astyle_javalib PRIVATE -DASTYLE_JNI)
+    target_include_directories(astyle_javalib PRIVATE ${JNI_INCLUDE_DIRS})
     # Windows DLL exports removed
-    set_property(TARGET astyle PROPERTY DEFINE_SYMBOL "")
+    set_property(TARGET astyle_javalib PROPERTY DEFINE_SYMBOL "")
     # Linux solib version added
-    set_property(TARGET astyle PROPERTY VERSION ${SOLIBVER})
-    set_property(TARGET astyle PROPERTY SOVERSION ${MAJORVER})
+    set_property(TARGET astyle_javalib PROPERTY VERSION ${SOLIBVER})
+    set_property(TARGET astyle_javalib PROPERTY SOVERSION ${MAJORVER})
+endif()
+
+if(BUILD_SHARED_LIBS OR BUILD_STATIC_LIBS)
+    add_library(astyle_lib ${SRCS})
+    target_compile_options(astyle_lib PRIVATE ${COMPILE_OPTS})
+    target_compile_options(astyle_lib PRIVATE -DASTYLE_LIB)
+    # Windows DLL exports removed
+    set_property(TARGET astyle_lib PROPERTY DEFINE_SYMBOL "")
+    # Linux solib version added
+    set_property(TARGET astyle_lib PROPERTY VERSION ${SOLIBVER})
+    set_property(TARGET astyle_lib PROPERTY SOVERSION ${MAJORVER})
+endif()
+
+if(BUILD_EXECUTABLE)
+    add_executable(astyle ${SRCS})
+    target_compile_options(astyle PRIVATE ${COMPILE_OPTS})
 endif()
 
 
@@ -97,7 +99,7 @@
 
 # Strip release builds
 if(CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "MinSizeRel")
-	if(NOT BUILD_STATIC_LIBS AND NOT BORLAND AND NOT MSVC)
+	if(BUILD_EXECUTABLE AND NOT BORLAND AND NOT MSVC)
 		add_custom_command(TARGET astyle POST_BUILD
 						   COMMAND ${CMAKE_STRIP} $<TARGET_FILE_NAME:astyle>)
 	endif()
@@ -127,13 +129,21 @@
 # This may be modified by -DCMAKE_INSTALL_PREFIX=
 # Default Win32 install prefix is not used (C:/Program Files (x86))
 
-option(INSTALL_DOC ON)
+option(INSTALL_DOC "Install documentation" ON)
 
 if(BUILD_SHARED_LIBS OR BUILD_STATIC_LIBS)
     if(NOT WIN32)
-        install(TARGETS astyle DESTINATION lib)
+        install(TARGETS astyle_lib DESTINATION lib)
+    endif()
+endif()
+
+if(BUILD_JAVA_LIBS)
+    if(NOT WIN32)
+        install(TARGETS astyle_javalib DESTINATION lib)
     endif()
-else()
+endif()
+
+if(BUILD_EXECUTABLE)
     if(SKBUILD)
         install(TARGETS astyle DESTINATION "${SKBUILD_SCRIPTS_DIR}")
         if(INSTALL_DOC)
@@ -173,22 +183,30 @@
 # Set output file names if different than 'astyle'
 if(BUILD_JAVA_LIBS)
     if(WIN32)
-        set_property(TARGET astyle PROPERTY OUTPUT_NAME AStyle32j)
-        set_property(TARGET astyle PROPERTY PREFIX "")
+        set_property(TARGET astyle_javalib PROPERTY OUTPUT_NAME AStyle32j)
+        set_property(TARGET astyle_javalib PROPERTY PREFIX "")
     else()
-        set_property(TARGET astyle PROPERTY OUTPUT_NAME astylej)
+        set_property(TARGET astyle_javalib PROPERTY OUTPUT_NAME astylej)
     endif()
-elseif(BUILD_SHARED_LIBS)
+endif()
+
+if(BUILD_SHARED_LIBS)
     if(WIN32)
-        set_property(TARGET astyle PROPERTY OUTPUT_NAME AStyle32)
-        set_property(TARGET astyle PROPERTY PREFIX "")
+        set_property(TARGET astyle_lib PROPERTY OUTPUT_NAME AStyle32)
+        set_property(TARGET astyle_lib PROPERTY PREFIX "")
+    else()
+        set_property(TARGET astyle_lib PROPERTY OUTPUT_NAME astyle)
     endif()
 elseif(BUILD_STATIC_LIBS)
     if(WIN32)
-        set_property(TARGET astyle PROPERTY OUTPUT_NAME AStyleLib)
-        set_property(TARGET astyle PROPERTY PREFIX "")
+        set_property(TARGET astyle_lib PROPERTY OUTPUT_NAME AStyleLib)
+        set_property(TARGET astyle_lib PROPERTY PREFIX "")
+    else()
+        set_property(TARGET astyle_lib PROPERTY OUTPUT_NAME astyle)
     endif()
-else()
+endif()
+
+if(BUILD_EXECUTABLE)
     if(WIN32)
         set_property(TARGET astyle PROPERTY OUTPUT_NAME AStyle)
     endif()
@@ -197,14 +215,18 @@
 
 # print info:
 
+SET(ASTYLE_BUILD_TYPE "")
 if(BUILD_JAVA_LIBS)
-	SET(ASTYLE_BUILD_TYPE "Java Shared Library")
-elseif(BUILD_SHARED_LIBS)
-	SET(ASTYLE_BUILD_TYPE "Shared Library")
-elseif(BUILD_STATIC_LIBS)
-	SET(ASTYLE_BUILD_TYPE "Static Library")
-else()
-	SET(ASTYLE_BUILD_TYPE "Executable")
+	SET(ASTYLE_BUILD_TYPE ${ASTYLE_BUILD_TYPE} "Java Shared Library")
+endif()
+if(BUILD_SHARED_LIBS)
+	SET(ASTYLE_BUILD_TYPE ${ASTYLE_BUILD_TYPE} "Shared Library")
+endif()
+if(BUILD_STATIC_LIBS)
+	SET(ASTYLE_BUILD_TYPE ${ASTYLE_BUILD_TYPE} "Static Library")
+endif()
+if(BUILD_EXECUTABLE)
+	SET(ASTYLE_BUILD_TYPE ${ASTYLE_BUILD_TYPE} "Executable")
 endif()
 
 # Display build information
 |