From: DRC Date: Sat, 3 Dec 2016 20:21:11 +0000 (-0600) Subject: Build: Fix issues when building as a Git submodule X-Git-Tag: 1.5.90~94 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=952191da79971939065b710d70655c14e6d66279;p=libjpeg-turbo Build: Fix issues when building as a Git submodule - Replace CMAKE_SOURCE_DIR with CMAKE_CURRENT_SOURCE_DIR - Replace CMAKE_BINARY_DIR with CMAKE_CURRENT_BINARY_DIR - Don't use "libjpeg-turbo" in any of the package system filenames (because CMAKE_PROJECT_NAME will not be the same if building LJT as a submodule.) Closes #122 --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 2ccd6b2..c57a243 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -500,7 +500,7 @@ if(UNIX) endif() # Include directories and compiler definitions -include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}) +include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) ############################################################################### @@ -561,11 +561,11 @@ if(WITH_TURBOJPEG) if(ENABLE_SHARED) set(TURBOJPEG_SOURCES ${JPEG_SOURCES} $ ${SIMD_OBJS} turbojpeg.c transupp.c jdatadst-tj.c jdatasrc-tj.c) - set(TJMAPFILE ${CMAKE_SOURCE_DIR}/turbojpeg-mapfile) + set(TJMAPFILE ${CMAKE_CURRENT_SOURCE_DIR}/turbojpeg-mapfile) if(WITH_JAVA) set(TURBOJPEG_SOURCES ${TURBOJPEG_SOURCES} turbojpeg-jni.c) include_directories(${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2}) - set(TJMAPFILE ${CMAKE_SOURCE_DIR}/turbojpeg-mapfile.jni) + set(TJMAPFILE ${CMAKE_CURRENT_SOURCE_DIR}/turbojpeg-mapfile.jni) endif() add_library(turbojpeg SHARED ${TURBOJPEG_SOURCES}) if(WIN32) @@ -809,7 +809,7 @@ if(ENABLE_STATIC) set(TEST_LIBTYPES ${TEST_LIBTYPES} static) endif() -set(TESTIMAGES ${CMAKE_SOURCE_DIR}/testimages) +set(TESTIMAGES ${CMAKE_CURRENT_SOURCE_DIR}/testimages) set(MD5CMP ${CMAKE_CURRENT_BINARY_DIR}/md5/md5cmp) if(CMAKE_CROSSCOMPILING) file(RELATIVE_PATH TESTIMAGES ${CMAKE_CURRENT_BINARY_DIR} ${TESTIMAGES}) @@ -1246,7 +1246,7 @@ foreach(libtype ${TEST_LIBTYPES}) endforeach() add_custom_target(testclean COMMAND ${CMAKE_COMMAND} -P - ${CMAKE_SOURCE_DIR}/cmakescripts/testclean.cmake) + ${CMAKE_CURRENT_SOURCE_DIR}/cmakescripts/testclean.cmake) if(WITH_TURBOJPEG) configure_file(tjbenchtest.in tjbenchtest @ONLY) @@ -1261,16 +1261,16 @@ if(WITH_TURBOJPEG) COMMAND echo ./tjbenchtest.java COMMAND ./tjbenchtest.java COMMAND echo ./tjbenchtest.java -yuv COMMAND ./tjbenchtest.java -yuv COMMAND echo ./tjexampletest COMMAND ./tjexampletest - DEPENDS ${CMAKE_BINARY_DIR}/tjbenchtest - ${CMAKE_BINARY_DIR}/tjbenchtest.java - ${CMAKE_BINARY_DIR}/tjexampletest) + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/tjbenchtest + ${CMAKE_CURRENT_BINARY_DIR}/tjbenchtest.java + ${CMAKE_CURRENT_BINARY_DIR}/tjexampletest) else() add_custom_target(tjtest echo ./tjbenchtest COMMAND ./tjbenchtest COMMAND echo ./tjbenchtest -alloc COMMAND ./tjbenchtest -alloc COMMAND echo ./tjbenchtest -yuv COMMAND ./tjbenchtest -yuv COMMAND echo ./tjbenchtest -yuv -alloc COMMAND ./tjbenchtest -yuv -alloc - DEPENDS ${CMAKE_BINARY_DIR}/tjbenchtest) + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/tjbenchtest) endif() endif() @@ -1297,7 +1297,8 @@ if(WITH_TURBOJPEG) DESTINATION ${BINDIR} RENAME tjbench${EXE}) endif() endif() - install(FILES ${CMAKE_SOURCE_DIR}/turbojpeg.h DESTINATION ${INCLUDEDIR}) + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/turbojpeg.h + DESTINATION ${INCLUDEDIR}) endif() if(ENABLE_STATIC) @@ -1314,28 +1315,30 @@ endif() install(TARGETS rdjpgcom wrjpgcom RUNTIME DESTINATION ${BINDIR}) -install(FILES ${CMAKE_SOURCE_DIR}/README.ijg ${CMAKE_SOURCE_DIR}/README.md - ${CMAKE_SOURCE_DIR}/example.c ${CMAKE_SOURCE_DIR}/libjpeg.txt - ${CMAKE_SOURCE_DIR}/structure.txt ${CMAKE_SOURCE_DIR}/usage.txt - ${CMAKE_SOURCE_DIR}/wizard.txt ${CMAKE_SOURCE_DIR}/LICENSE.md - DESTINATION ${DOCDIR}) +install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/README.ijg + ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/example.c + ${CMAKE_CURRENT_SOURCE_DIR}/libjpeg.txt + ${CMAKE_CURRENT_SOURCE_DIR}/structure.txt + ${CMAKE_CURRENT_SOURCE_DIR}/usage.txt ${CMAKE_CURRENT_SOURCE_DIR}/wizard.txt + ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.md DESTINATION ${DOCDIR}) if(UNIX) - install(FILES ${CMAKE_SOURCE_DIR}/cjpeg.1 ${CMAKE_SOURCE_DIR}/djpeg.1 - ${CMAKE_SOURCE_DIR}/jpegtran.1 ${CMAKE_SOURCE_DIR}/rdjpgcom.1 - ${CMAKE_SOURCE_DIR}/wrjpgcom.1 DESTINATION ${MANDIR}/man1) - install(FILES ${CMAKE_BINARY_DIR}/pkgscripts/libjpeg.pc - ${CMAKE_BINARY_DIR}/pkgscripts/libturbojpeg.pc + install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/cjpeg.1 + ${CMAKE_CURRENT_SOURCE_DIR}/djpeg.1 ${CMAKE_CURRENT_SOURCE_DIR}/jpegtran.1 + ${CMAKE_CURRENT_SOURCE_DIR}/rdjpgcom.1 + ${CMAKE_CURRENT_SOURCE_DIR}/wrjpgcom.1 DESTINATION ${MANDIR}/man1) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgscripts/libjpeg.pc + ${CMAKE_CURRENT_BINARY_DIR}/pkgscripts/libturbojpeg.pc DESTINATION ${LIBDIR}/pkgconfig) endif() -install(FILES ${CMAKE_BINARY_DIR}/jconfig.h ${CMAKE_SOURCE_DIR}/jerror.h - ${CMAKE_SOURCE_DIR}/jmorecfg.h ${CMAKE_SOURCE_DIR}/jpeglib.h - DESTINATION ${INCLUDEDIR}) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/jconfig.h + ${CMAKE_CURRENT_SOURCE_DIR}/jerror.h ${CMAKE_CURRENT_SOURCE_DIR}/jmorecfg.h + ${CMAKE_CURRENT_SOURCE_DIR}/jpeglib.h DESTINATION ${INCLUDEDIR}) include(cmakescripts/BuildPackages.cmake) -configure_file("${CMAKE_SOURCE_DIR}/cmakescripts/cmake_uninstall.cmake.in" +configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmakescripts/cmake_uninstall.cmake.in" "cmake_uninstall.cmake" IMMEDIATE @ONLY) add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P cmake_uninstall.cmake) diff --git a/cmakescripts/BuildPackages.cmake b/cmakescripts/BuildPackages.cmake index bce2745..a647c67 100644 --- a/cmakescripts/BuildPackages.cmake +++ b/cmakescripts/BuildPackages.cmake @@ -38,8 +38,7 @@ message(STATUS "RPM architecture = ${RPMARCH}, DEB architecture = ${DEBARCH}") boolean_number(CMAKE_POSITION_INDEPENDENT_CODE) configure_file(release/makerpm.in pkgscripts/makerpm) -configure_file(release/${CMAKE_PROJECT_NAME}.spec.in - pkgscripts/${CMAKE_PROJECT_NAME}.spec @ONLY) +configure_file(release/rpm.spec.in pkgscripts/rpm.spec @ONLY) add_custom_target(rpm sh pkgscripts/makerpm SOURCES pkgscripts/makerpm) @@ -95,16 +94,16 @@ endif() STRING(REGEX REPLACE "/" "\\\\" INST_DIR ${CMAKE_INSTALL_PREFIX}) -configure_file(release/${CMAKE_PROJECT_NAME}.nsi.in ${CMAKE_PROJECT_NAME}.nsi @ONLY) +configure_file(release/installer.nsi.in installer.nsi @ONLY) if(WITH_JAVA) set(JAVA_DEPEND java) endif() add_custom_target(installer - makensis -nocd ${INST_DEFS} ${CMAKE_PROJECT_NAME}.nsi + makensis -nocd ${INST_DEFS} installer.nsi DEPENDS jpeg jpeg-static turbojpeg turbojpeg-static rdjpgcom wrjpgcom cjpeg djpeg jpegtran tjbench ${JAVA_DEPEND} - SOURCES ${CMAKE_PROJECT_NAME}.nsi) + SOURCES installer.nsi) endif() # WIN32 @@ -160,8 +159,8 @@ endif() # APPLE add_custom_target(dist COMMAND git archive --prefix=${CMAKE_PROJECT_NAME}-${VERSION}/ HEAD | - gzip > ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}-${VERSION}.tar.gz - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) + gzip > ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}-${VERSION}.tar.gz + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) configure_file(release/maketarball.in pkgscripts/maketarball) diff --git a/cmakescripts/cmake_uninstall.cmake.in b/cmakescripts/cmake_uninstall.cmake.in index b35d100..6726a0d 100644 --- a/cmakescripts/cmake_uninstall.cmake.in +++ b/cmakescripts/cmake_uninstall.cmake.in @@ -1,10 +1,10 @@ # This code is from the CMake FAQ -if (NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt") - message(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"") -endif(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt") +if (NOT EXISTS "@CMAKE_BINARY_DIR@/install_manifest.txt") + message(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_BINARY_DIR@/install_manifest.txt\"") +endif(NOT EXISTS "@CMAKE_BINARY_DIR@/install_manifest.txt") -file(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files) +file(READ "@CMAKE_BINARY_DIR@/install_manifest.txt" files) string(REGEX REPLACE "\n" ";" files "${files}") list(REVERSE files) foreach (file ${files}) diff --git a/release/libjpeg-turbo.nsi.in b/release/installer.nsi.in similarity index 65% rename from release/libjpeg-turbo.nsi.in rename to release/installer.nsi.in index f080d1e..b413838 100755 --- a/release/libjpeg-turbo.nsi.in +++ b/release/installer.nsi.in @@ -1,6 +1,6 @@ !include x64.nsh Name "@CMAKE_PROJECT_NAME@ SDK for @INST_PLATFORM@" -OutFile "@CMAKE_BINARY_DIR@\${BUILDDIR}@INST_NAME@.exe" +OutFile "@CMAKE_CURRENT_BINARY_DIR@\${BUILDDIR}@INST_NAME@.exe" InstallDir @INST_DIR@ SetCompressor bzip2 @@ -35,58 +35,58 @@ Section "@CMAKE_PROJECT_NAME@ SDK for @INST_PLATFORM@ (required)" notexists: SetOutPath $SYSDIR !ifdef GCC - File "@CMAKE_BINARY_DIR@\libturbojpeg.dll" + File "@CMAKE_CURRENT_BINARY_DIR@\libturbojpeg.dll" !else - File "@CMAKE_BINARY_DIR@\${BUILDDIR}turbojpeg.dll" + File "@CMAKE_CURRENT_BINARY_DIR@\${BUILDDIR}turbojpeg.dll" !endif SetOutPath $INSTDIR\bin !ifdef GCC - File "@CMAKE_BINARY_DIR@\libturbojpeg.dll" + File "@CMAKE_CURRENT_BINARY_DIR@\libturbojpeg.dll" !else - File "@CMAKE_BINARY_DIR@\${BUILDDIR}turbojpeg.dll" + File "@CMAKE_CURRENT_BINARY_DIR@\${BUILDDIR}turbojpeg.dll" !endif !ifdef GCC - File "@CMAKE_BINARY_DIR@\libjpeg-@SO_MAJOR_VERSION@.dll" + File "@CMAKE_CURRENT_BINARY_DIR@\libjpeg-@SO_MAJOR_VERSION@.dll" !else - File "@CMAKE_BINARY_DIR@\${BUILDDIR}jpeg@SO_MAJOR_VERSION@.dll" + File "@CMAKE_CURRENT_BINARY_DIR@\${BUILDDIR}jpeg@SO_MAJOR_VERSION@.dll" !endif - File "@CMAKE_BINARY_DIR@\${BUILDDIR}cjpeg.exe" - File "@CMAKE_BINARY_DIR@\${BUILDDIR}djpeg.exe" - File "@CMAKE_BINARY_DIR@\${BUILDDIR}jpegtran.exe" - File "@CMAKE_BINARY_DIR@\${BUILDDIR}tjbench.exe" - File "@CMAKE_BINARY_DIR@\${BUILDDIR}rdjpgcom.exe" - File "@CMAKE_BINARY_DIR@\${BUILDDIR}wrjpgcom.exe" + File "@CMAKE_CURRENT_BINARY_DIR@\${BUILDDIR}cjpeg.exe" + File "@CMAKE_CURRENT_BINARY_DIR@\${BUILDDIR}djpeg.exe" + File "@CMAKE_CURRENT_BINARY_DIR@\${BUILDDIR}jpegtran.exe" + File "@CMAKE_CURRENT_BINARY_DIR@\${BUILDDIR}tjbench.exe" + File "@CMAKE_CURRENT_BINARY_DIR@\${BUILDDIR}rdjpgcom.exe" + File "@CMAKE_CURRENT_BINARY_DIR@\${BUILDDIR}wrjpgcom.exe" SetOutPath $INSTDIR\lib !ifdef GCC - File "@CMAKE_BINARY_DIR@\libturbojpeg.dll.a" - File "@CMAKE_BINARY_DIR@\libturbojpeg.a" - File "@CMAKE_BINARY_DIR@\libjpeg.dll.a" - File "@CMAKE_BINARY_DIR@\libjpeg.a" + File "@CMAKE_CURRENT_BINARY_DIR@\libturbojpeg.dll.a" + File "@CMAKE_CURRENT_BINARY_DIR@\libturbojpeg.a" + File "@CMAKE_CURRENT_BINARY_DIR@\libjpeg.dll.a" + File "@CMAKE_CURRENT_BINARY_DIR@\libjpeg.a" !else - File "@CMAKE_BINARY_DIR@\${BUILDDIR}turbojpeg.lib" - File "@CMAKE_BINARY_DIR@\${BUILDDIR}turbojpeg-static.lib" - File "@CMAKE_BINARY_DIR@\${BUILDDIR}jpeg.lib" - File "@CMAKE_BINARY_DIR@\${BUILDDIR}jpeg-static.lib" + File "@CMAKE_CURRENT_BINARY_DIR@\${BUILDDIR}turbojpeg.lib" + File "@CMAKE_CURRENT_BINARY_DIR@\${BUILDDIR}turbojpeg-static.lib" + File "@CMAKE_CURRENT_BINARY_DIR@\${BUILDDIR}jpeg.lib" + File "@CMAKE_CURRENT_BINARY_DIR@\${BUILDDIR}jpeg-static.lib" !endif !ifdef JAVA SetOutPath $INSTDIR\classes - File "@CMAKE_BINARY_DIR@\java\turbojpeg.jar" + File "@CMAKE_CURRENT_BINARY_DIR@\java\turbojpeg.jar" !endif SetOutPath $INSTDIR\include - File "@CMAKE_BINARY_DIR@\jconfig.h" - File "@CMAKE_SOURCE_DIR@\jerror.h" - File "@CMAKE_SOURCE_DIR@\jmorecfg.h" - File "@CMAKE_SOURCE_DIR@\jpeglib.h" - File "@CMAKE_SOURCE_DIR@\turbojpeg.h" + File "@CMAKE_CURRENT_BINARY_DIR@\jconfig.h" + File "@CMAKE_CURRENT_SOURCE_DIR@\jerror.h" + File "@CMAKE_CURRENT_SOURCE_DIR@\jmorecfg.h" + File "@CMAKE_CURRENT_SOURCE_DIR@\jpeglib.h" + File "@CMAKE_CURRENT_SOURCE_DIR@\turbojpeg.h" SetOutPath $INSTDIR\doc - File "@CMAKE_SOURCE_DIR@\README.ijg" - File "@CMAKE_SOURCE_DIR@\README.md" - File "@CMAKE_SOURCE_DIR@\LICENSE.md" - File "@CMAKE_SOURCE_DIR@\example.c" - File "@CMAKE_SOURCE_DIR@\libjpeg.txt" - File "@CMAKE_SOURCE_DIR@\structure.txt" - File "@CMAKE_SOURCE_DIR@\usage.txt" - File "@CMAKE_SOURCE_DIR@\wizard.txt" + File "@CMAKE_CURRENT_SOURCE_DIR@\README.ijg" + File "@CMAKE_CURRENT_SOURCE_DIR@\README.md" + File "@CMAKE_CURRENT_SOURCE_DIR@\LICENSE.md" + File "@CMAKE_CURRENT_SOURCE_DIR@\example.c" + File "@CMAKE_CURRENT_SOURCE_DIR@\libjpeg.txt" + File "@CMAKE_CURRENT_SOURCE_DIR@\structure.txt" + File "@CMAKE_CURRENT_SOURCE_DIR@\usage.txt" + File "@CMAKE_CURRENT_SOURCE_DIR@\wizard.txt" WriteRegStr HKLM "SOFTWARE\@INST_REG_NAME@ @VERSION@" "Install_Dir" "$INSTDIR" diff --git a/release/makemacpkg.in b/release/makemacpkg.in index 2364399..74143e0 100644 --- a/release/makemacpkg.in +++ b/release/makemacpkg.in @@ -52,7 +52,7 @@ UNIVERSAL=0 PACKAGE_NAME=@PKGNAME@ VERSION=@VERSION@ BUILD=@BUILD@ -SRCDIR=@CMAKE_SOURCE_DIR@ +SRCDIR=@CMAKE_CURRENT_SOURCE_DIR@ BUILDDIR32=@OSX_32BIT_BUILD@ BUILDDIRARMV7=@IOS_ARMV7_BUILD@ BUILDDIRARMV7S=@IOS_ARMV7S_BUILD@ diff --git a/release/makerpm.in b/release/makerpm.in index 70b3787..fc3b1d4 100644 --- a/release/makerpm.in +++ b/release/makerpm.in @@ -25,6 +25,6 @@ TMPDIR=`mktemp -d /tmp/@CMAKE_PROJECT_NAME@-build.XXXXXX` mkdir -p $TMPDIR/RPMS ln -fs `pwd` $TMPDIR/BUILD rpmbuild -bb --define "_blddir $TMPDIR/buildroot" --define "_topdir $TMPDIR" \ - --target @RPMARCH@ pkgscripts/@CMAKE_PROJECT_NAME@.spec; \ + --target @RPMARCH@ pkgscripts/rpm.spec; \ cp $TMPDIR/RPMS/@RPMARCH@/@PKGNAME@-@VERSION@-@BUILD@.@RPMARCH@.rpm \ @PKGNAME@-@VERSION@.@RPMARCH@.rpm diff --git a/release/makesrpm.in b/release/makesrpm.in index 441438e..728b06a 100644 --- a/release/makesrpm.in +++ b/release/makesrpm.in @@ -39,10 +39,10 @@ fi cp $PROJECT-$VERSION.tar.gz $TMPDIR/SOURCES/$PROJECT-$VERSION.tar.gz -cat pkgscripts/$PROJECT.spec | sed s/%{_blddir}/%{_tmppath}/g \ - | sed s/#--\>//g > $TMPDIR/SPECS/$PROJECT.spec +cat pkgscripts/rpm.spec | sed s/%{_blddir}/%{_tmppath}/g \ + | sed s/#--\>//g > $TMPDIR/SPECS/rpm.spec -rpmbuild -bs --define "_topdir $TMPDIR" $TMPDIR/SPECS/$PROJECT.spec +rpmbuild -bs --define "_topdir $TMPDIR" $TMPDIR/SPECS/rpm.spec mv $TMPDIR/SRPMS/$PKGNAME-$VERSION-$BUILD.src.rpm $PKGNAME-$VERSION.src.rpm exit diff --git a/release/libjpeg-turbo.spec.in b/release/rpm.spec.in similarity index 98% rename from release/libjpeg-turbo.spec.in rename to release/rpm.spec.in index 5bf6e02..f452798 100644 --- a/release/libjpeg-turbo.spec.in +++ b/release/rpm.spec.in @@ -16,7 +16,7 @@ Version: @VERSION@ Vendor: @PKGVENDOR@ URL: @PKGURL@ Group: System Environment/Libraries -#-->Source0: http://prdownloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-%{version}.tar.gz +#-->Source0: http://prdownloads.sourceforge.net/@CMAKE_PROJECT_NAME@/@CMAKE_PROJECT_NAME@-%{version}.tar.gz Release: @BUILD@ License: BSD-style BuildRoot: %{_blddir}/%{name}-buildroot-%{version}-%{release} diff --git a/sharedlib/CMakeLists.txt b/sharedlib/CMakeLists.txt index 6a65590..1afd6a6 100755 --- a/sharedlib/CMakeLists.txt +++ b/sharedlib/CMakeLists.txt @@ -5,9 +5,9 @@ # better yet, provide a friendly way of configuring a Windows target to use the # static C library. -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) -set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) -set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/..) +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/..) +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/..) if(MSVC) # Build all configurations against shared C library @@ -20,7 +20,7 @@ if(MSVC) endif() foreach(src ${JPEG_SOURCES}) - set(JPEG_SRCS ${JPEG_SRCS} ${CMAKE_SOURCE_DIR}/${src}) + set(JPEG_SRCS ${JPEG_SRCS} ../${src}) endforeach() if(WITH_SIMD AND MSVC_IDE) @@ -30,9 +30,9 @@ endif() if(WIN32) if(WITH_MEM_SRCDST) - set(DEFFILE ${CMAKE_SOURCE_DIR}/win/jpeg${SO_MAJOR_VERSION}-memsrcdst.def) + set(DEFFILE ../win/jpeg${SO_MAJOR_VERSION}-memsrcdst.def) else() - set(DEFFILE ${CMAKE_SOURCE_DIR}/win/jpeg${SO_MAJOR_VERSION}.def) + set(DEFFILE ../win/jpeg${SO_MAJOR_VERSION}.def) endif() endif() add_library(jpeg SHARED ${JPEG_SRCS} ${DEFFILE} $ @@ -45,7 +45,7 @@ if(APPLE) endif() if(MAPFLAG) set_target_properties(jpeg PROPERTIES - LINK_FLAGS "${MAPFLAG}${CMAKE_BINARY_DIR}/libjpeg.map") + LINK_FLAGS "${MAPFLAG}${CMAKE_CURRENT_BINARY_DIR}/../libjpeg.map") endif() if(MSVC) set_target_properties(jpeg PROPERTIES SUFFIX ${SO_MAJOR_VERSION}.dll) diff --git a/simd/CMakeLists.txt b/simd/CMakeLists.txt index 6ae794f..e8d63eb 100755 --- a/simd/CMakeLists.txt +++ b/simd/CMakeLists.txt @@ -77,8 +77,8 @@ message(STATUS "CMAKE_ASM_NASM_FLAGS = ${EFFECTIVE_ASM_NASM_FLAGS}") set(CMAKE_ASM_NASM_FLAGS "${CMAKE_ASM_NASM_FLAGS} -I\"${CMAKE_CURRENT_SOURCE_DIR}/nasm/\" -I\"${CMAKE_CURRENT_SOURCE_DIR}/${CPU_TYPE}/\"") if(WIN32) - set(CMAKE_ASM_NASM_FLAGS "${CMAKE_ASM_NASM_FLAGS} -I\"${CMAKE_SOURCE_DIR}/win/\"") - set(JSIMDCFG_INC ${CMAKE_SOURCE_DIR}/win/jsimdcfg.inc) + set(CMAKE_ASM_NASM_FLAGS "${CMAKE_ASM_NASM_FLAGS} -I\"${CMAKE_CURRENT_SOURCE_DIR}/../win/\"") + set(JSIMDCFG_INC ${CMAKE_CURRENT_SOURCE_DIR}/../win/jsimdcfg.inc) else() set(GREP grep) if(CMAKE_SYSTEM_NAME STREQUAL "SunOS") diff --git a/tjbenchtest.in b/tjbenchtest.in index a5e14f3..ad4a493 100755 --- a/tjbenchtest.in +++ b/tjbenchtest.in @@ -21,9 +21,9 @@ runme() EXT=bmp IMAGES="vgl_5674_0098.${EXT} vgl_6434_0018a.${EXT} vgl_6548_0026a.${EXT} nightshot_iso_100.${EXT}" -IMGDIR=@CMAKE_SOURCE_DIR@/testimages +IMGDIR=@CMAKE_CURRENT_SOURCE_DIR@/testimages OUTDIR=`mktemp -d /tmp/__tjbenchtest_output.XXXXXX` -EXEDIR=. +EXEDIR=@CMAKE_CURRENT_BINARY_DIR@ BMPARG= NSARG= YUVARG= diff --git a/tjbenchtest.java.in b/tjbenchtest.java.in index 2860169..91f2112 100755 --- a/tjbenchtest.java.in +++ b/tjbenchtest.java.in @@ -20,10 +20,10 @@ runme() } IMAGES="vgl_5674_0098.bmp vgl_6434_0018a.bmp vgl_6548_0026a.bmp nightshot_iso_100.bmp" -IMGDIR=@CMAKE_SOURCE_DIR@/testimages +IMGDIR=@CMAKE_CURRENT_SOURCE_DIR@/testimages OUTDIR=`mktemp -d /tmp/__tjbenchtest_java_output.XXXXXX` -EXEDIR=. -JAVA="@Java_JAVA_EXECUTABLE@ -cp java/turbojpeg.jar -Djava.library.path=." +EXEDIR=@CMAKE_CURRENT_BINARY_DIR@ +JAVA="@Java_JAVA_EXECUTABLE@ -cp $EXEDIR/java/turbojpeg.jar -Djava.library.path=$EXEDIR" BMPARG= NSARG= YUVARG= diff --git a/tjexampletest.in b/tjexampletest.in index 0aa6e20..619d04f 100755 --- a/tjexampletest.in +++ b/tjexampletest.in @@ -20,10 +20,10 @@ runme() } IMAGES="vgl_5674_0098.bmp vgl_6434_0018a.bmp vgl_6548_0026a.bmp nightshot_iso_100.bmp" -IMGDIR=@CMAKE_SOURCE_DIR@/testimages +IMGDIR=@CMAKE_CURRENT_SOURCE_DIR@/testimages OUTDIR=__tjexampletest_output -EXEDIR=. -JAVA="@Java_JAVA_EXECUTABLE@ -cp java/turbojpeg.jar -Djava.library.path=." +EXEDIR=@CMAKE_CURRENT_BINARY_DIR@ +JAVA="@Java_JAVA_EXECUTABLE@ -cp $EXEDIR/java/turbojpeg.jar -Djava.library.path=$EXEDIR" if [ -d $OUTDIR ]; then rm -rf $OUTDIR