@@ -220,10 +220,8 @@ macro(boolean_number var)
220220 endif ()
221221endmacro ()
222222
223- option (ENABLE_SHARED "Build shared libraries" TRUE )
224- boolean_number (ENABLE_SHARED )
225- option (ENABLE_STATIC "Build static libraries" TRUE )
226- boolean_number (ENABLE_STATIC )
223+ option (BUILD_SHARED_LIBS "Build shared libraries" TRUE )
224+ boolean_number (BUILD_SHARED_LIBS )
227225option (REQUIRE_SIMD
228226 "Generate a fatal error if SIMD extensions are not available for this platform (default is to fall back to a non-SIMD build)"
229227 FALSE )
@@ -242,7 +240,7 @@ if(CMAKE_C_COMPILER_ABI MATCHES "ELF X32")
242240 set (WITH_JAVA 0)
243241else ()
244242 option (WITH_JAVA
245- "Build Java wrapper for the TurboJPEG API library (implies ENABLE_SHARED =1)"
243+ "Build Java wrapper for the TurboJPEG API library (implies BUILD_SHARED_LIBS =1)"
246244 FALSE )
247245 boolean_number (WITH_JAVA )
248246endif ()
@@ -270,7 +268,7 @@ macro(report_option var desc)
270268endmacro ()
271269
272270if (WITH_JAVA)
273- set (ENABLE_SHARED 1)
271+ set (BUILD_SHARED_LIBS 1)
274272endif ()
275273
276274# Explicitly setting CMAKE_POSITION_INDEPENDENT_CODE=FALSE disables PIC for all
@@ -279,14 +277,13 @@ endif()
279277# to FALSE, we need to unset it, thus restoring the default behavior
280278# (automatically using PIC for shared library targets.)
281279if (DEFINED CMAKE_POSITION_INDEPENDENT_CODE AND
282- NOT CMAKE_POSITION_INDEPENDENT_CODE AND ENABLE_SHARED )
280+ NOT CMAKE_POSITION_INDEPENDENT_CODE AND BUILD_SHARED_LIBS )
283281 unset (CMAKE_POSITION_INDEPENDENT_CODE CACHE )
284282endif ()
285283
286- report_option (ENABLE_SHARED "Shared libraries" )
287- report_option (ENABLE_STATIC "Static libraries" )
284+ report_option (BUILD_SHARED_LIBS "Shared libraries" )
288285
289- if (ENABLE_SHARED )
286+ if (BUILD_SHARED_LIBS )
290287 set (CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR} )
291288endif ()
292289
@@ -653,7 +650,7 @@ if(WITH_JAVA)
653650 add_subdirectory (java )
654651endif ()
655652
656- if (ENABLE_SHARED )
653+ if (BUILD_SHARED_LIBS )
657654 # Compile a separate version of these source files with 12-bit and 16-bit
658655 # data precision.
659656 add_library (jpeg12 OBJECT ${JPEG12_SOURCES} )
@@ -665,7 +662,7 @@ if(ENABLE_SHARED)
665662 add_subdirectory (sharedlib )
666663endif ()
667664
668- if (ENABLE_STATIC )
665+ if (NOT BUILD_SHARED_LIBS )
669666 # Compile a separate version of these source files with 12-bit and 16-bit
670667 # data precision.
671668 add_library (jpeg12-static OBJECT ${JPEG12_SOURCES} )
@@ -683,7 +680,7 @@ if(ENABLE_STATIC)
683680endif ()
684681
685682if (WITH_TURBOJPEG)
686- if (ENABLE_SHARED )
683+ if (BUILD_SHARED_LIBS )
687684 set (TURBOJPEG_SOURCES ${JPEG_SOURCES} ${SIMD_TARGET_OBJECTS} ${SIMD_OBJS}
688685 turbojpeg.c transupp.c jdatadst-tj.c jdatasrc-tj.c rdbmp.c rdppm.c
689686 wrbmp.c wrppm.c $<TARGET_OBJECTS :jpeg12 > $<TARGET_OBJECTS :jpeg16 >)
@@ -754,7 +751,7 @@ if(WITH_TURBOJPEG)
754751 endif ()
755752 endif ()
756753
757- if (ENABLE_STATIC )
754+ if (NOT BUILD_SHARED_LIBS )
758755 add_library (turbojpeg12-static OBJECT rdppm.c wrppm.c )
759756 set_property (TARGET turbojpeg12-static PROPERTY COMPILE_FLAGS
760757 "-DBITS_IN_JSAMPLE=12 -DPPM_SUPPORTED" )
@@ -799,7 +796,7 @@ if(PNG_SUPPORTED)
799796 set (CJPEG_BMP_SOURCES ${CJPEG_BMP_SOURCES} rdpng.c)
800797endif ()
801798
802- if (ENABLE_STATIC )
799+ if (NOT BUILD_SHARED_LIBS )
803800 # Compile a separate version of these source files with 12-bit and 16-bit
804801 # data precision.
805802 add_library (cjpeg12-static OBJECT rdgif.c rdppm.c )
@@ -947,10 +944,10 @@ if(WITH_JAVA)
947944endif ()
948945
949946set (TEST_LIBTYPES "" )
950- if (ENABLE_SHARED )
947+ if (BUILD_SHARED_LIBS )
951948 set (TEST_LIBTYPES ${TEST_LIBTYPES} shared)
952949endif ()
953- if (ENABLE_STATIC )
950+ if (NOT BUILD_SHARED_LIBS )
954951 set (TEST_LIBTYPES ${TEST_LIBTYPES} static)
955952endif ()
956953
@@ -1796,7 +1793,7 @@ endif()
17961793set (EXE ${CMAKE_EXECUTABLE_SUFFIX} )
17971794
17981795if (WITH_TURBOJPEG)
1799- if (ENABLE_SHARED )
1796+ if (BUILD_SHARED_LIBS )
18001797 install (TARGETS turbojpeg EXPORT ${CMAKE_PROJECT_NAME} Targets
18011798 INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
18021799 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT lib
@@ -1810,11 +1807,11 @@ if(WITH_TURBOJPEG)
18101807 DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT bin OPTIONAL )
18111808 endif ()
18121809 endif ()
1813- if (ENABLE_STATIC )
1810+ if (NOT BUILD_SHARED_LIBS )
18141811 install (TARGETS turbojpeg-static EXPORT ${CMAKE_PROJECT_NAME} Targets
18151812 INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
18161813 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT lib)
1817- if (NOT ENABLE_SHARED )
1814+ if (NOT BUILD_SHARED_LIBS )
18181815 if (GENERATOR_IS_MULTI_CONFIG)
18191816 set (DIR "${CMAKE_CURRENT_BINARY_DIR} /\$ {CMAKE_INSTALL_CONFIG_NAME}" )
18201817 else ()
@@ -1828,11 +1825,11 @@ if(WITH_TURBOJPEG)
18281825 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT include)
18291826endif ()
18301827
1831- if (ENABLE_STATIC )
1828+ if (NOT BUILD_SHARED_LIBS )
18321829 install (TARGETS jpeg-static EXPORT ${CMAKE_PROJECT_NAME} Targets
18331830 INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
18341831 ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT lib)
1835- if (NOT ENABLE_SHARED )
1832+ if (NOT BUILD_SHARED_LIBS )
18361833 if (GENERATOR_IS_MULTI_CONFIG)
18371834 set (DIR "${CMAKE_CURRENT_BINARY_DIR} /\$ {CMAKE_INSTALL_CONFIG_NAME}" )
18381835 else ()
0 commit comments