Made some improvements to the CMake package config file support.

Author: mdadams

build/cmake/modules/JasPerConfig.cmake.in

@@ -1,5 +1,14 @@
 @PACKAGE_INIT@
 
-set(JasPer_FOUND TRUE)
+INCLUDE(CMakeFindDependencyMacro)
 
-include("${CMAKE_CURRENT_LIST_DIR}/JasPerTargets.cmake")
+# Ensure that the JPEG::JPEG imported target is defined (if appropriate).
+IF(@JAS_INCLUDE_JPG_CODEC@)
+	FIND_DEPENDENCY(JPEG)
+ENDIF()
+
+# Mark the JasPer library as found.
+SET(JasPer_FOUND TRUE)
+
+# Include the exported targets.
+INCLUDE("${CMAKE_CURRENT_LIST_DIR}/JasPerTargets.cmake")

src/libjasper/CMakeLists.txt

@@ -168,16 +168,6 @@ add_library(libjasper ${libjasper_type}
 	${libjasper_ras_sources}
 )
 
-if(JAS_ENABLE_CMAKE_PACKAGE_CONFIG)
-	install(TARGETS libjasper
-	  EXPORT JasPerTargets
-	  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-	  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-	  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-	  INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-	)
-endif()
-
 # The JasPer include directories in the source and build tree must be included
 # before any other directories that may contain the include directory for an
 # already installed version of the JasPer library.
@@ -226,6 +216,17 @@ generate_export_header(libjasper
   NO_EXPORT_MACRO_NAME JAS_LOCAL
 )
 
+if(JAS_ENABLE_CMAKE_PACKAGE_CONFIG)
+	#install(TARGETS libjasper ${JAS_LIBJPEG_TARGET}
+	install(TARGETS libjasper
+	  EXPORT JasPerTargets
+	  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+	  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+	  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+	  INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+	)
+endif()
+
 install(TARGETS libjasper
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}

test/src/CMakeLists.txt

@@ -0,0 +1,10 @@
+cmake_minimum_required(VERSION 3.20)
+
+project(test_app LANGUAGES C)
+
+find_package(JasPer CONFIG REQUIRED)
+
+add_executable(app app.c)
+target_link_libraries(app JasPer::libjasper)
+
+install(CODE "message(STATUS \"Dummy install target executed.\")")

test/src/app.c

@@ -0,0 +1,28 @@
+/******************************************************************************\
+* Includes.
+\******************************************************************************/
+
+#include <stdlib.h>
+#include <stdio.h>
+
+#include <jasper/jasper.h>
+
+/******************************************************************************\
+* Some dummy code.
+\******************************************************************************/
+
+int main(int argc, char **argv)
+{
+	jas_conf_clear();
+	if (jas_init_library()) {
+		fprintf(stderr, "cannot initialize JasPer library\n");
+		return EXIT_FAILURE;
+	}
+	if (jas_init_thread()) {
+		fprintf(stderr, "cannot initialize thread\n");
+		return EXIT_FAILURE;
+	}
+	jas_cleanup_thread();
+	jas_cleanup_library();
+	return 0;
+}