Attachment #168329 for bug #208033




Link against an actual target name, not the generated library name.

If we link against the latter, there is no dependency between lastfm-fpclient
and fplib, which can break parallel builds starting with CMake 3.5.0.
--- CMakeLists.txt.orig	2016-03-16 09:53:03 UTC
+++ CMakeLists.txt
@@ -139,7 +139,7 @@ ADD_EXECUTABLE(lastfm-fpclient
 
 # Link the executable
 TARGET_LINK_LIBRARIES(lastfm-fpclient
-   fplib
+   fplib_shared
    fftw3f
    mad
    tag




Changing CMAKE_{SOURCE,BINARY}_DIR like volk does in its top-level
CMakeLists.txt no longer works with CMake 3.5.0.

Use PROJECT_{BINARY,SOURCE}_DIR instead.

Obtained from: http://pkgs.fedoraproject.org/cgit/rpms/gnuradio.git/commit/?id=b50c7e66f6e3a1e6a84e25505d3fd873756c2027
Upstream patch and discussion: https://github.com/gnuradio/volk/pull/65
--- volk/apps/CMakeLists.txt.cmake35	2016-02-07 10:09:12.000000000 -0700
+++ volk/apps/CMakeLists.txt	2016-02-23 20:47:31.513538541 -0700
@@ -19,23 +19,23 @@
 # Setup profiler
 ########################################################################
 if(MSVC)
-    include_directories(${CMAKE_SOURCE_DIR}/cmake/msvc)
+    include_directories(${PROJECT_SOURCE_DIR}/cmake/msvc)
 endif(MSVC)
 
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
-    ${CMAKE_SOURCE_DIR}/include
-    ${CMAKE_BINARY_DIR}/include
-    ${CMAKE_SOURCE_DIR}/lib
-    ${CMAKE_BINARY_DIR}/lib
+    ${PROJECT_SOURCE_DIR}/include
+    ${PROJECT_BINARY_DIR}/include
+    ${PROJECT_SOURCE_DIR}/lib
+    ${PROJECT_BINARY_DIR}/lib
     ${Boost_INCLUDE_DIRS}
 )
 
 # MAKE volk_profile
 add_executable(volk_profile
     ${CMAKE_CURRENT_SOURCE_DIR}/volk_profile.cc
-    ${CMAKE_SOURCE_DIR}/lib/qa_utils.cc
+    ${PROJECT_SOURCE_DIR}/lib/qa_utils.cc
 )
 
 
--- volk/lib/CMakeLists.txt.cmake35	2016-02-07 10:09:12.000000000 -0700
+++ volk/lib/CMakeLists.txt	2016-02-23 20:47:31.516538564 -0700
@@ -90,7 +90,7 @@ endif()
 ########################################################################
 execute_process(
     COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
-    ${CMAKE_SOURCE_DIR}/gen/volk_compile_utils.py
+    ${PROJECT_SOURCE_DIR}/gen/volk_compile_utils.py
     --mode "arch_flags" --compiler "${COMPILER_NAME}"
     OUTPUT_VARIABLE arch_flag_lines OUTPUT_STRIP_TRAILING_WHITESPACE
 )
@@ -278,7 +278,7 @@ message(STATUS "Available architectures:
 ########################################################################
 execute_process(
     COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
-    ${CMAKE_SOURCE_DIR}/gen/volk_compile_utils.py
+    ${PROJECT_SOURCE_DIR}/gen/volk_compile_utils.py
     --mode "machines" --archs "${available_archs}"
     OUTPUT_VARIABLE available_machines OUTPUT_STRIP_TRAILING_WHITESPACE
 )
@@ -310,9 +310,9 @@ message(STATUS "Available machines: ${av
 ########################################################################
 
 #dependencies are all python, xml, and header implementation files
-file(GLOB xml_files ${CMAKE_SOURCE_DIR}/gen/*.xml)
-file(GLOB py_files ${CMAKE_SOURCE_DIR}/gen/*.py)
-file(GLOB h_files ${CMAKE_SOURCE_DIR}/kernels/volk/*.h)
+file(GLOB xml_files ${PROJECT_SOURCE_DIR}/gen/*.xml)
+file(GLOB py_files ${PROJECT_SOURCE_DIR}/gen/*.py)
+file(GLOB h_files ${PROJECT_SOURCE_DIR}/kernels/volk/*.h)
 
 macro(gen_template tmpl output)
     list(APPEND volk_gen_sources ${output})
@@ -320,21 +320,21 @@ macro(gen_template tmpl output)
         OUTPUT ${output}
         DEPENDS ${xml_files} ${py_files} ${h_files} ${tmpl}
         COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
-        ${CMAKE_SOURCE_DIR}/gen/volk_tmpl_utils.py
+        ${PROJECT_SOURCE_DIR}/gen/volk_tmpl_utils.py
         --input ${tmpl} --output ${output} ${ARGN}
     )
 endmacro(gen_template)
 
-make_directory(${CMAKE_BINARY_DIR}/include/volk)
+make_directory(${PROJECT_BINARY_DIR}/include/volk)
 
-gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk.tmpl.h              ${CMAKE_BINARY_DIR}/include/volk/volk.h)
-gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk.tmpl.c              ${CMAKE_BINARY_DIR}/lib/volk.c)
-gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_typedefs.tmpl.h     ${CMAKE_BINARY_DIR}/include/volk/volk_typedefs.h)
-gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_cpu.tmpl.h          ${CMAKE_BINARY_DIR}/include/volk/volk_cpu.h)
-gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_cpu.tmpl.c          ${CMAKE_BINARY_DIR}/lib/volk_cpu.c)
-gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_config_fixed.tmpl.h ${CMAKE_BINARY_DIR}/include/volk/volk_config_fixed.h)
-gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_machines.tmpl.h     ${CMAKE_BINARY_DIR}/lib/volk_machines.h)
-gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_machines.tmpl.c     ${CMAKE_BINARY_DIR}/lib/volk_machines.c)
+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk.tmpl.h              ${PROJECT_BINARY_DIR}/include/volk/volk.h)
+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk.tmpl.c              ${PROJECT_BINARY_DIR}/lib/volk.c)
+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_typedefs.tmpl.h     ${PROJECT_BINARY_DIR}/include/volk/volk_typedefs.h)
+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_cpu.tmpl.h          ${PROJECT_BINARY_DIR}/include/volk/volk_cpu.h)
+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_cpu.tmpl.c          ${PROJECT_BINARY_DIR}/lib/volk_cpu.c)
+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_config_fixed.tmpl.h ${PROJECT_BINARY_DIR}/include/volk/volk_config_fixed.h)
+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_machines.tmpl.h     ${PROJECT_BINARY_DIR}/lib/volk_machines.h)
+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_machines.tmpl.c     ${PROJECT_BINARY_DIR}/lib/volk_machines.c)
 
 set(BASE_CFLAGS NONE)
 string(TOUPPER ${CMAKE_BUILD_TYPE} CBTU)
@@ -362,12 +362,12 @@ set(COMPILER_INFO "${CMAKE_C_COMPILER}::
 foreach(machine_name ${available_machines})
     #generate machine source
     set(machine_source ${CMAKE_CURRENT_BINARY_DIR}/volk_machine_${machine_name}.c)
-    gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_machine_xxx.tmpl.c ${machine_source} ${machine_name})
+    gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_machine_xxx.tmpl.c ${machine_source} ${machine_name})
 
     #determine machine flags
     execute_process(
         COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
-        ${CMAKE_SOURCE_DIR}/gen/volk_compile_utils.py
+        ${PROJECT_SOURCE_DIR}/gen/volk_compile_utils.py
         --mode "machine_flags" --machine "${machine_name}" --compiler "${COMPILER_NAME}"
         OUTPUT_VARIABLE ${machine_name}_flags OUTPUT_STRIP_TRAILING_WHITESPACE
     )
@@ -393,9 +393,9 @@ string(REPLACE "\n" " \\n" COMPILER_INFO
 # Set local include directories first
 ########################################################################
 include_directories(
-    ${CMAKE_BINARY_DIR}/include
-    ${CMAKE_SOURCE_DIR}/include
-    ${CMAKE_SOURCE_DIR}/kernels
+    ${PROJECT_BINARY_DIR}/include
+    ${PROJECT_SOURCE_DIR}/include
+    ${PROJECT_SOURCE_DIR}/kernels
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}
 )
@@ -420,8 +420,8 @@ if(${CMAKE_VERSION} VERSION_GREATER "2.8
       # setup architecture specific assembler flags
       set(ARCH_ASM_FLAGS "-mfpu=neon -g")
       # then add the files
-      include_directories(${CMAKE_SOURCE_DIR}/kernels/volk/asm/neon)
-      file(GLOB asm_files ${CMAKE_SOURCE_DIR}/kernels/volk/asm/neon/*.s)
+      include_directories(${PROJECT_SOURCE_DIR}/kernels/volk/asm/neon)
+      file(GLOB asm_files ${PROJECT_SOURCE_DIR}/kernels/volk/asm/neon/*.s)
       foreach(asm_file ${asm_files})
         list(APPEND volk_sources ${asm_file})
         message(STATUS "Adding source file: ${asm_file}")
@@ -453,7 +453,7 @@ if(ORC_FOUND)
     list(APPEND volk_libraries ${ORC_LIBRARIES})
 
     #setup orc functions
-    file(GLOB orc_files ${CMAKE_SOURCE_DIR}/kernels/volk/asm/orc/*.orc)
+    file(GLOB orc_files ${PROJECT_SOURCE_DIR}/kernels/volk/asm/orc/*.orc)
     foreach(orc_file ${orc_files})
 
         #extract the name for the generated c source from the orc file
@@ -511,7 +511,7 @@ PROPERTIES COMPILE_DEFINITIONS "${machin
 
 if(MSVC)
     #add compatibility includes for stdint types
-    include_directories(${CMAKE_SOURCE_DIR}/cmake/msvc)
+    include_directories(${PROJECT_SOURCE_DIR}/cmake/msvc)
     add_definitions(-DHAVE_CONFIG_H)
     #compile the sources as C++ due to the lack of complex.h under MSVC
     set_source_files_properties(${volk_sources} PROPERTIES LANGUAGE CXX)
diff -up gnuradio-3.7.9.1/volk/python/volk_modtool/CMakeLists.txt.cmake35 gnuradio-3.7.9.1/volk/python/volk_modtool/CMakeLists.txt

Lines 1-9 Link Here

(-)b/devel/cmake-gui/Makefile (-2 / +2 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= cmake	3	PORTNAME= cmake
4	PORTVERSION= 3.4.2	4	PORTVERSION= 3.5.0
5	CATEGORIES= devel	5	CATEGORIES= devel
6	MASTER_SITES= https://www.cmake.org/files/v3.4/	6	MASTER_SITES= https://www.cmake.org/files/v3.5/
7	PKGNAMESUFFIX= -gui	7	PKGNAMESUFFIX= -gui
8		8
9	MAINTAINER= kde@FreeBSD.org	9	MAINTAINER= kde@FreeBSD.org

Lines 69-78 Link Here

(-)b/devel/cmake-modules/pkg-plist (+25 lines)
69	%%DATADIR%%/Modules/CMakeFortranInformation.cmake	69	%%DATADIR%%/Modules/CMakeFortranInformation.cmake
70	%%DATADIR%%/Modules/CMakeGenericSystem.cmake	70	%%DATADIR%%/Modules/CMakeGenericSystem.cmake
71	%%DATADIR%%/Modules/CMakeGraphVizOptions.cmake	71	%%DATADIR%%/Modules/CMakeGraphVizOptions.cmake
		72	%%DATADIR%%/Modules/CMakeIOSInstallCombined.cmake
72	%%DATADIR%%/Modules/CMakeImportBuildSettings.cmake	73	%%DATADIR%%/Modules/CMakeImportBuildSettings.cmake
73	%%DATADIR%%/Modules/CMakeJOMFindMake.cmake	74	%%DATADIR%%/Modules/CMakeJOMFindMake.cmake
74	%%DATADIR%%/Modules/CMakeJavaCompiler.cmake.in	75	%%DATADIR%%/Modules/CMakeJavaCompiler.cmake.in
75	%%DATADIR%%/Modules/CMakeJavaInformation.cmake	76	%%DATADIR%%/Modules/CMakeJavaInformation.cmake
		77	%%DATADIR%%/Modules/CMakeLanguageInformation.cmake
76	%%DATADIR%%/Modules/CMakeMSYSFindMake.cmake	78	%%DATADIR%%/Modules/CMakeMSYSFindMake.cmake
77	%%DATADIR%%/Modules/CMakeMinGWFindMake.cmake	79	%%DATADIR%%/Modules/CMakeMinGWFindMake.cmake
78	%%DATADIR%%/Modules/CMakeNMakeFindMake.cmake	80	%%DATADIR%%/Modules/CMakeNMakeFindMake.cmake
Lines 169-174 Link Here
169	%%DATADIR%%/Modules/CheckVariableExists.c	171	%%DATADIR%%/Modules/CheckVariableExists.c
170	%%DATADIR%%/Modules/CheckVariableExists.cmake	172	%%DATADIR%%/Modules/CheckVariableExists.cmake
171	%%DATADIR%%/Modules/Compiler/ADSP-DetermineCompiler.cmake	173	%%DATADIR%%/Modules/Compiler/ADSP-DetermineCompiler.cmake
		174	%%DATADIR%%/Modules/Compiler/ARMCC-ASM.cmake
		175	%%DATADIR%%/Modules/Compiler/ARMCC-C.cmake
		176	%%DATADIR%%/Modules/Compiler/ARMCC-CXX.cmake
		177	%%DATADIR%%/Modules/Compiler/ARMCC-DetermineCompiler.cmake
		178	%%DATADIR%%/Modules/Compiler/ARMCC.cmake
172	%%DATADIR%%/Modules/Compiler/Absoft-Fortran.cmake	179	%%DATADIR%%/Modules/Compiler/Absoft-Fortran.cmake
173	%%DATADIR%%/Modules/Compiler/AppleClang-ASM.cmake	180	%%DATADIR%%/Modules/Compiler/AppleClang-ASM.cmake
174	%%DATADIR%%/Modules/Compiler/AppleClang-C-FeatureTests.cmake	181	%%DATADIR%%/Modules/Compiler/AppleClang-C-FeatureTests.cmake
Lines 194-199 Link Here
194	%%DATADIR%%/Modules/Compiler/Cray-CXX.cmake	201	%%DATADIR%%/Modules/Compiler/Cray-CXX.cmake
195	%%DATADIR%%/Modules/Compiler/Cray-DetermineCompiler.cmake	202	%%DATADIR%%/Modules/Compiler/Cray-DetermineCompiler.cmake
196	%%DATADIR%%/Modules/Compiler/Cray-Fortran.cmake	203	%%DATADIR%%/Modules/Compiler/Cray-Fortran.cmake
		204	%%DATADIR%%/Modules/Compiler/CrayPrgEnv-C.cmake
		205	%%DATADIR%%/Modules/Compiler/CrayPrgEnv-CXX.cmake
		206	%%DATADIR%%/Modules/Compiler/CrayPrgEnv-Cray-C.cmake
		207	%%DATADIR%%/Modules/Compiler/CrayPrgEnv-Cray-CXX.cmake
		208	%%DATADIR%%/Modules/Compiler/CrayPrgEnv-Cray-Fortran.cmake
		209	%%DATADIR%%/Modules/Compiler/CrayPrgEnv-Fortran.cmake
		210	%%DATADIR%%/Modules/Compiler/CrayPrgEnv-GNU-C.cmake
		211	%%DATADIR%%/Modules/Compiler/CrayPrgEnv-GNU-CXX.cmake
		212	%%DATADIR%%/Modules/Compiler/CrayPrgEnv-GNU-Fortran.cmake
		213	%%DATADIR%%/Modules/Compiler/CrayPrgEnv-Intel-C.cmake
		214	%%DATADIR%%/Modules/Compiler/CrayPrgEnv-Intel-CXX.cmake
		215	%%DATADIR%%/Modules/Compiler/CrayPrgEnv-Intel-Fortran.cmake
		216	%%DATADIR%%/Modules/Compiler/CrayPrgEnv-PGI-C.cmake
		217	%%DATADIR%%/Modules/Compiler/CrayPrgEnv-PGI-CXX.cmake
		218	%%DATADIR%%/Modules/Compiler/CrayPrgEnv-PGI-Fortran.cmake
		219	%%DATADIR%%/Modules/Compiler/CrayPrgEnv.cmake
197	%%DATADIR%%/Modules/Compiler/Embarcadero-DetermineCompiler.cmake	220	%%DATADIR%%/Modules/Compiler/Embarcadero-DetermineCompiler.cmake
198	%%DATADIR%%/Modules/Compiler/Fujitsu-DetermineCompiler.cmake	221	%%DATADIR%%/Modules/Compiler/Fujitsu-DetermineCompiler.cmake
199	%%DATADIR%%/Modules/Compiler/G95-Fortran.cmake	222	%%DATADIR%%/Modules/Compiler/G95-Fortran.cmake
Lines 422-427 Link Here
422	%%DATADIR%%/Modules/FindX11.cmake	445	%%DATADIR%%/Modules/FindX11.cmake
423	%%DATADIR%%/Modules/FindXCTest.cmake	446	%%DATADIR%%/Modules/FindXCTest.cmake
424	%%DATADIR%%/Modules/FindXMLRPC.cmake	447	%%DATADIR%%/Modules/FindXMLRPC.cmake
		448	%%DATADIR%%/Modules/FindXalanC.cmake
425	%%DATADIR%%/Modules/FindXercesC.cmake	449	%%DATADIR%%/Modules/FindXercesC.cmake
426	%%DATADIR%%/Modules/FindZLIB.cmake	450	%%DATADIR%%/Modules/FindZLIB.cmake
427	%%DATADIR%%/Modules/Findosg.cmake	451	%%DATADIR%%/Modules/Findosg.cmake
Lines 541-546 Link Here
541	%%DATADIR%%/Modules/Platform/CYGWIN-windres.cmake	565	%%DATADIR%%/Modules/Platform/CYGWIN-windres.cmake
542	%%DATADIR%%/Modules/Platform/CYGWIN.cmake	566	%%DATADIR%%/Modules/Platform/CYGWIN.cmake
543	%%DATADIR%%/Modules/Platform/Catamount.cmake	567	%%DATADIR%%/Modules/Platform/Catamount.cmake
		568	%%DATADIR%%/Modules/Platform/CrayLinuxEnvironment.cmake
544	%%DATADIR%%/Modules/Platform/Darwin-Absoft-Fortran.cmake	569	%%DATADIR%%/Modules/Platform/Darwin-Absoft-Fortran.cmake
545	%%DATADIR%%/Modules/Platform/Darwin-AppleClang-C.cmake	570	%%DATADIR%%/Modules/Platform/Darwin-AppleClang-C.cmake
546	%%DATADIR%%/Modules/Platform/Darwin-AppleClang-CXX.cmake	571	%%DATADIR%%/Modules/Platform/Darwin-AppleClang-CXX.cmake

Lines 2-11 Link Here

(-)b/devel/cmake/Makefile (-2 / +2 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= cmake	4	PORTNAME= cmake
5	PORTVERSION= 3.4.2	5	PORTVERSION= 3.5.0
6	PORTREVISION?= 0	6	PORTREVISION?= 0
7	CATEGORIES= devel	7	CATEGORIES= devel
8	MASTER_SITES= https://www.cmake.org/files/v3.4/	8	MASTER_SITES= https://www.cmake.org/files/v3.5/
9		9
10	MAINTAINER= kde@FreeBSD.org	10	MAINTAINER= kde@FreeBSD.org
11	COMMENT?= Cross-platform Makefile generator	11	COMMENT?= Cross-platform Makefile generator

Lines 1-2 Link Here

(-)b/devel/cmake/distinfo (-2 / +2 lines)
1	SHA256 (cmake-3.4.2.tar.gz) = da7cc34e1ce1d82e67a32ab081c02c2845534cd8bf2e09d88077a1b282e97392	1	SHA256 (cmake-3.5.0.tar.gz) = 92c83ad8a4fd6224cf6319a60b399854f55b38ebe9d297c942408b792b1a9efa
2	SIZE (cmake-3.4.2.tar.gz) = 6722152	2	SIZE (cmake-3.5.0.tar.gz) = 6861686

Removed Link Here

(-)a/devel/cmake/files/patch-Modules_FindDCMTK.cmake (-10 lines)
1	--- Modules/FindDCMTK.cmake.orig 2012-07-11 12:01:05.000000000 +0200
2	+++ Modules/FindDCMTK.cmake 2012-07-11 12:01:51.000000000 +0200
3	@@ -56,6 +56,7 @@
4	ijg12
5	ijg16
6	ijg8
7	+ oflog
8	ofstd)
9
10	find_library(DCMTK_${lib}_LIBRARY




Fixes a crash in CMake itself when configuring x11-toolkits/fltk-devel with
CMake 3.4.0.

commit 9d653f9c1cc129be4fdce7f0e93c282760c7603e
Author: Stephen Kelly <steveire@gmail.com>
Date:   Sat Aug 29 18:05:46 2015 +0200

    cmFLTKWrapUI: Remove CMake 2.2 compat code.

    CMake 3.0 dropped CMake <= 2.4 compatibility.

--- Source/cmFLTKWrapUICommand.cxx
+++ Source/cmFLTKWrapUICommand.cxx
@@ -129,45 +129,6 @@ void cmFLTKWrapUICommand::FinalPass()
     cmSystemTools::Message(msg.c_str(),"Warning");
     return;
     }
-  std::vector<cmSourceFile*> srcs;
-  target->GetSourceFiles(srcs, "");
-  bool found = false;
-  for (unsigned int i = 0; i < srcs.size(); ++i)
-    {
-    if (srcs[i]->GetFullPath() ==
-        this->GeneratedSourcesClasses[0]->GetFullPath())
-      {
-      found = true;
-      break;
-      }
-    }
-  if (!found)
-    {
-    std::string msg =
-      "In CMake 2.2 the FLTK_WRAP_UI command sets a variable to the list of "
-      "source files that should be added to your executable or library. It "
-      "appears that you have not added these source files to your target. "
-      "You should change your CMakeLists.txt file to "
-      "directly add the generated files to the target. "
-      "For example FTLK_WRAP_UI(foo src1 src2 src3) "
-      "will create a variable named foo_FLTK_UI_SRCS that contains the list "
-      "of sources to add to your target when you call ADD_LIBRARY or "
-      "ADD_EXECUTABLE. For now CMake will add the sources to your target "
-      "for you as was done in CMake 2.0 and earlier. In the future this may "
-      "become an error.";
-    msg +="The problem was found while processing the source directory: ";
-    msg += this->Makefile->GetCurrentSourceDirectory();
-    cmSystemTools::Message(msg.c_str(),"Warning");
-    // first we add the rules for all the .fl to .h and .cxx files
-    size_t lastHeadersClass = this->GeneratedSourcesClasses.size();
-
-    // Generate code for all the .fl files
-    for(size_t classNum = 0; classNum < lastHeadersClass; classNum++)
-      {
-      this->Makefile->GetTargets()[this->Target]
-        .AddSource(this->GeneratedSourcesClasses[classNum]->GetFullPath());
-      }
-    }
 }
 
 




%%DATADIR%%/Help/command/build_name.rst
%%DATADIR%%/Help/command/cmake_host_system_information.rst
%%DATADIR%%/Help/command/cmake_minimum_required.rst
%%DATADIR%%/Help/command/cmake_parse_arguments.rst
%%DATADIR%%/Help/command/cmake_policy.rst
%%DATADIR%%/Help/command/configure_file.rst
%%DATADIR%%/Help/command/continue.rst

%%DATADIR%%/Help/module/FindHTMLHelp.rst
%%DATADIR%%/Help/module/FindHg.rst
%%DATADIR%%/Help/module/FindITK.rst
%%DATADIR%%/Help/module/FindIntl.rst
%%DATADIR%%/Help/module/FindIce.rst
%%DATADIR%%/Help/module/FindIcotool.rst
%%DATADIR%%/Help/module/FindImageMagick.rst
%%DATADIR%%/Help/module/FindIntl.rst
%%DATADIR%%/Help/module/FindJNI.rst
%%DATADIR%%/Help/module/FindJPEG.rst
%%DATADIR%%/Help/module/FindJasper.rst

%%DATADIR%%/Help/module/FindX11.rst
%%DATADIR%%/Help/module/FindXCTest.rst
%%DATADIR%%/Help/module/FindXMLRPC.rst
%%DATADIR%%/Help/module/FindXalanC.rst
%%DATADIR%%/Help/module/FindXercesC.rst
%%DATADIR%%/Help/module/FindZLIB.rst
%%DATADIR%%/Help/module/Findosg.rst

%%DATADIR%%/Help/prop_tgt/INTERFACE_SYSTEM_INCLUDE_DIRECTORIES.rst
%%DATADIR%%/Help/prop_tgt/INTERPROCEDURAL_OPTIMIZATION.rst
%%DATADIR%%/Help/prop_tgt/INTERPROCEDURAL_OPTIMIZATION_CONFIG.rst
%%DATADIR%%/Help/prop_tgt/IOS_INSTALL_COMBINED.rst
%%DATADIR%%/Help/prop_tgt/JOB_POOL_COMPILE.rst
%%DATADIR%%/Help/prop_tgt/JOB_POOL_LINK.rst
%%DATADIR%%/Help/prop_tgt/LABELS.rst

%%DATADIR%%/Help/release/3.2.rst
%%DATADIR%%/Help/release/3.3.rst
%%DATADIR%%/Help/release/3.4.rst
%%DATADIR%%/Help/release/3.5.rst
%%DATADIR%%/Help/release/dev.txt
%%DATADIR%%/Help/release/index.rst
%%DATADIR%%/Help/variable/APPLE.rst

%%DATADIR%%/Help/variable/CMAKE_EXECUTABLE_SUFFIX.rst
%%DATADIR%%/Help/variable/CMAKE_EXE_LINKER_FLAGS.rst
%%DATADIR%%/Help/variable/CMAKE_EXE_LINKER_FLAGS_CONFIG.rst
%%DATADIR%%/Help/variable/CMAKE_EXPORT_COMPILE_COMMANDS.rst
%%DATADIR%%/Help/variable/CMAKE_EXPORT_NO_PACKAGE_REGISTRY.rst
%%DATADIR%%/Help/variable/CMAKE_EXTRA_GENERATOR.rst
%%DATADIR%%/Help/variable/CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES.rst

%%DATADIR%%/Help/variable/CMAKE_INSTALL_RPATH.rst
%%DATADIR%%/Help/variable/CMAKE_INSTALL_RPATH_USE_LINK_PATH.rst
%%DATADIR%%/Help/variable/CMAKE_INTERNAL_PLATFORM_ABI.rst
%%DATADIR%%/Help/variable/CMAKE_IOS_INSTALL_COMBINED.rst
%%DATADIR%%/Help/variable/CMAKE_JOB_POOL_COMPILE.rst
%%DATADIR%%/Help/variable/CMAKE_JOB_POOL_LINK.rst
%%DATADIR%%/Help/variable/CMAKE_LANG_ARCHIVE_APPEND.rst




Make sure the dependency exists, as testfiletemplates depends on ui files
generated by kdevfiletemplates.

Submitted upstream: https://phabricator.kde.org/D1160
--- plugins/filetemplates/CMakeLists.txt.orig	2016-03-17 11:59:47 UTC
+++ plugins/filetemplates/CMakeLists.txt
@@ -81,6 +81,7 @@ main.cpp
 )
 
 kde4_add_executable(testfiletemplates ${test_srcs})
+add_dependencies(testfiletemplates kdevfiletemplates)
 
 target_link_libraries(testfiletemplates
     ${KDE4_KDECORE_LIBS}




The libvncclient target was removed because it was not used anywhere (aqemu
links against the systems libvncclient.so, only the definitions and includes
are needed from this block) and did not declare its dependency on the moc and
ui files, possibly causing problems in parallel builds.
--- CMakeLists.txt.orig	2011-01-14 19:38:53 UTC
+++ CMakeLists.txt
@@ -164,7 +164,6 @@ IF( NOT WITHOUT_EMBEDDED_DISPLAY )
 										Embedded_Display/vncclientthread.cpp Embedded_Display/vncview.cpp )
 	
 	ADD_DEFINITIONS( -DVNC_DISPLAY -DQTONLY )
-	ADD_LIBRARY( libvncclient SHARED ${aqemu_headers} ${aqemu_sources} )
 	
 	INCLUDE_DIRECTORIES( ${VNCCLIENT_INCLUDE_DIRS} ${LIBVNCCLIENT_INCLUDE_DIR} )
 ENDIF( NOT WITHOUT_EMBEDDED_DISPLAY )
@@ -318,6 +317,6 @@ IF( INSTALL_MAN )
 		MESSAGE( STATUS "MAN_PAGE_COMPRESSOR flag not set. Available values: gzip, bzip2, lzma" )
 		MESSAGE( STATUS "Will be installed not compressed MAN pages" )
 		

Lines 17-24 LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png Link Here

(-)b/games/vavoom/Makefile (-2 lines)
17	USES= cmake dos2unix jpeg tar:bzip2	17	USES= cmake dos2unix jpeg tar:bzip2
18	DOS2UNIX_REGEX= ((.\.(c\|cpp\|h\|s\|asm\|inc\|vc\|ls\|acs\|cfg\|txt\|vs\|mak\|mgw"))$$\|\/(makefile\..\|makefile\|Makefile)$$)	18	DOS2UNIX_REGEX= ((.\.(c\|cpp\|h\|s\|asm\|inc\|vc\|ls\|acs\|cfg\|txt\|vs\|mak\|mgw"))$$\|\/(makefile\..\|makefile\|Makefile)$$)
19		19
20	MAKE_JOBS_UNSAFE= yes
21
22	OPTIONS_DEFINE= FLAC LAUNCHER MAD MIKMOD OPENAL OPTIMIZED_CFLAGS VORBIS SDL DOCS	20	OPTIONS_DEFINE= FLAC LAUNCHER MAD MIKMOD OPENAL OPTIMIZED_CFLAGS VORBIS SDL DOCS
23	OPTIONS_DEFAULT= OPENGL SDL	21	OPTIONS_DEFAULT= OPENGL SDL
24	LAUNCHER_DESC= Build GUI launcher	22	LAUNCHER_DESC= Build GUI launcher

Added Link Here

(-)b/games/vavoom/files/patch-progs_common_CMakeLists.txt (+8 lines)
1	--- progs/common/CMakeLists.txt.orig 2016-03-16 16:45:41 UTC
2	+++ progs/common/CMakeLists.txt
3	@@ -17,4 +17,4 @@ add_custom_command(OUTPUT ${OUTDIR}/uiba
4	COMMAND ${VCC} ARGS -P${OUTDIR} ${CMAKE_CURRENT_SOURCE_DIR}/uibase/classes.vc ${OUTDIR}/uibase.dat
5	DEPENDS vcc uibase/*.vc ${OUTDIR}/engine.dat)
6	add_custom_target(uibase ALL DEPENDS ${OUTDIR}/uibase.dat)
7	-add_dependencies(uibase vcc engine)
8	+add_dependencies(uibase vcc engine linespec)




--- source/CMakeLists.txt.orig	2016-03-16 16:43:57 UTC
+++ source/CMakeLists.txt
@@ -790,7 +790,7 @@ if (MAIN_COMPILE_FLAGS)
 	set_target_properties(vavoom PROPERTIES COMPILE_FLAGS ${MAIN_COMPILE_FLAGS})
 endif (MAIN_COMPILE_FLAGS)
 target_link_libraries(vavoom ${MAIN_LIBS})
-add_dependencies(vavoom core timidity glbsp libglvis)
+add_dependencies(vavoom core timidity glbsp libglvis revision_check)
 
 install(TARGETS vavoom DESTINATION ${BINDIR})
 
@@ -845,7 +845,7 @@ else(ENABLE_WRAPPERS)
 endif(ENABLE_WRAPPERS)
 set_target_properties(vavoom-dedicated PROPERTIES COMPILE_FLAGS -DSERVER)
 target_link_libraries(vavoom-dedicated glbsp core ${ZLIB_LIBRARY} ${NET_LIBRARIES})
-add_dependencies(vavoom-dedicated core glbsp)
+add_dependencies(vavoom-dedicated core glbsp revision_check)
 
 install(TARGETS vavoom-dedicated DESTINATION ${BINDIR})
 




This commit is required to avoid occasional build failures in parallel builds.

From 7389dc990c67d4269f3a79c924c054e87f2e4ac5 Mon Sep 17 00:00:00 2001
From: Alexandr Akulich <akulichalexander@gmail.com>
Date: Fri, 15 Jan 2016 18:54:09 +0500
Subject: CMakeLists: Added missing service dependence.

telepathy-qt-service depends on generated stable and future types and consts.

--- TelepathyQt/CMakeLists.txt
+++ TelepathyQt/CMakeLists.txt
@@ -953,6 +953,7 @@ if(ENABLE_SERVICE_SUPPORT)
     #endif (ENABLE_COMPILER_COVERAGE)
     # lets build a static only library until we have a stable API/ABI
     add_library(telepathy-qt${QT_VERSION_MAJOR}-service STATIC ${telepathy_qt_service_SRCS})
+    add_dependencies(telepathy-qt${QT_VERSION_MAJOR}-service stable-typesgen future-typesgen)
 
     # generate service moc files
     foreach(moc_src ${telepathy_qt_service_MOC_SRCS})

Lines 34-39 LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \ Link Here

(-)b/science/orthanc/Makefile (+1 lines)
34	libpugixml.so:${PORTSDIR}/textproc/pugixml	34	libpugixml.so:${PORTSDIR}/textproc/pugixml
35		35
36	CMAKE_ARGS= -DDCMTK_LIBRARIES="dcmdsig;charls;dcmjpls" \	36	CMAKE_ARGS= -DDCMTK_LIBRARIES="dcmdsig;charls;dcmjpls" \
		37	-DDCMTK_DIR="${LOCALBASE}" \
37	-DDCMTK_DICTIONARY_DIR="${LOCALBASE}/share/dcmtk" \	38	-DDCMTK_DICTIONARY_DIR="${LOCALBASE}/share/dcmtk" \
38	-DUSE_SYSTEM_MONGOOSE=OFF \	39	-DUSE_SYSTEM_MONGOOSE=OFF \
39	-DUNIT_TESTS_WITH_HTTP_CONNEXIONS=OFF	40	-DUNIT_TESTS_WITH_HTTP_CONNEXIONS=OFF




Fix the build with CMake 3.5.0.

FindDCMTK.cmake was rewritten upstream, and is incompatible with the uses in
this file: we need to set DCMTK_DIR in the port's Makefile, and it does not
match the directory used for searching for the headers below.
--- Resources/CMake/DcmtkConfiguration.cmake.orig	2015-12-15 16:49:02 UTC
+++ Resources/CMake/DcmtkConfiguration.cmake
@@ -186,10 +186,10 @@ else()
     -DHAVE_CONFIG_H=1
     )
 
-  if (EXISTS "${DCMTK_DIR}/config/cfunix.h")
-    set(DCMTK_CONFIGURATION_FILE "${DCMTK_DIR}/config/cfunix.h")
-  elseif (EXISTS "${DCMTK_DIR}/config/osconfig.h")  # This is for Arch Linux
-    set(DCMTK_CONFIGURATION_FILE "${DCMTK_DIR}/config/osconfig.h")
+  if (EXISTS "${DCMTK_config_INCLUDE_DIR}/cfunix.h")
+    set(DCMTK_CONFIGURATION_FILE "${DCMTK_config_INCLUDE_DIR}/cfunix.h")
+  elseif (EXISTS "${DCMTK_config_INCLUDE_DIR}/osconfig.h")  # This is for Arch Linux
+    set(DCMTK_CONFIGURATION_FILE "${DCMTK_config_INCLUDE_DIR}/osconfig.h")
   else()
     message(FATAL_ERROR "Please install libdcmtk*-dev")
   endif()

Return to bug 208033

Added Link Here

(-)b/audio/fplib/files/patch-CMakeLists.txt (+15 lines)
1	Link against an actual target name, not the generated library name.
2
3	If we link against the latter, there is no dependency between lastfm-fpclient
4	and fplib, which can break parallel builds starting with CMake 3.5.0.
5	--- CMakeLists.txt.orig 2016-03-16 09:53:03 UTC
6	+++ CMakeLists.txt
7	@@ -139,7 +139,7 @@ ADD_EXECUTABLE(lastfm-fpclient
8
9	# Link the executable
10	TARGET_LINK_LIBRARIES(lastfm-fpclient
11	- fplib
12	+ fplib_shared
13	fftw3f
14	mad
15	tag

Added Link Here

(-)b/comms/gnuradio/files/patch-cmake-3.5.0 (+162 lines)
1	Changing CMAKE_{SOURCE,BINARY}_DIR like volk does in its top-level
2	CMakeLists.txt no longer works with CMake 3.5.0.
3
4	Use PROJECT_{BINARY,SOURCE}_DIR instead.
5
6	Obtained from: http://pkgs.fedoraproject.org/cgit/rpms/gnuradio.git/commit/?id=b50c7e66f6e3a1e6a84e25505d3fd873756c2027
7	Upstream patch and discussion: https://github.com/gnuradio/volk/pull/65
8	--- volk/apps/CMakeLists.txt.cmake35 2016-02-07 10:09:12.000000000 -0700
9	+++ volk/apps/CMakeLists.txt 2016-02-23 20:47:31.513538541 -0700
10	@@ -19,23 +19,23 @@
11	# Setup profiler
12	########################################################################
13	if(MSVC)
14	- include_directories(${CMAKE_SOURCE_DIR}/cmake/msvc)
15	+ include_directories(${PROJECT_SOURCE_DIR}/cmake/msvc)
16	endif(MSVC)
17
18	include_directories(
19	${CMAKE_CURRENT_SOURCE_DIR}
20	${CMAKE_CURRENT_BINARY_DIR}
21	- ${CMAKE_SOURCE_DIR}/include
22	- ${CMAKE_BINARY_DIR}/include
23	- ${CMAKE_SOURCE_DIR}/lib
24	- ${CMAKE_BINARY_DIR}/lib
25	+ ${PROJECT_SOURCE_DIR}/include
26	+ ${PROJECT_BINARY_DIR}/include
27	+ ${PROJECT_SOURCE_DIR}/lib
28	+ ${PROJECT_BINARY_DIR}/lib
29	${Boost_INCLUDE_DIRS}
30	)
31
32	# MAKE volk_profile
33	add_executable(volk_profile
34	${CMAKE_CURRENT_SOURCE_DIR}/volk_profile.cc
35	- ${CMAKE_SOURCE_DIR}/lib/qa_utils.cc
36	+ ${PROJECT_SOURCE_DIR}/lib/qa_utils.cc
37	)
38
39
40	--- volk/lib/CMakeLists.txt.cmake35 2016-02-07 10:09:12.000000000 -0700
41	+++ volk/lib/CMakeLists.txt 2016-02-23 20:47:31.516538564 -0700
42	@@ -90,7 +90,7 @@ endif()
43	########################################################################
44	execute_process(
45	COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
46	- ${CMAKE_SOURCE_DIR}/gen/volk_compile_utils.py
47	+ ${PROJECT_SOURCE_DIR}/gen/volk_compile_utils.py
48	--mode "arch_flags" --compiler "${COMPILER_NAME}"
49	OUTPUT_VARIABLE arch_flag_lines OUTPUT_STRIP_TRAILING_WHITESPACE
50	)
51	@@ -278,7 +278,7 @@ message(STATUS "Available architectures:
52	########################################################################
53	execute_process(
54	COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
55	- ${CMAKE_SOURCE_DIR}/gen/volk_compile_utils.py
56	+ ${PROJECT_SOURCE_DIR}/gen/volk_compile_utils.py
57	--mode "machines" --archs "${available_archs}"
58	OUTPUT_VARIABLE available_machines OUTPUT_STRIP_TRAILING_WHITESPACE
59	)
60	@@ -310,9 +310,9 @@ message(STATUS "Available machines: ${av
61	########################################################################
62
63	#dependencies are all python, xml, and header implementation files
64	-file(GLOB xml_files ${CMAKE_SOURCE_DIR}/gen/*.xml)
65	-file(GLOB py_files ${CMAKE_SOURCE_DIR}/gen/*.py)
66	-file(GLOB h_files ${CMAKE_SOURCE_DIR}/kernels/volk/*.h)
67	+file(GLOB xml_files ${PROJECT_SOURCE_DIR}/gen/*.xml)
68	+file(GLOB py_files ${PROJECT_SOURCE_DIR}/gen/*.py)
69	+file(GLOB h_files ${PROJECT_SOURCE_DIR}/kernels/volk/*.h)
70
71	macro(gen_template tmpl output)
72	list(APPEND volk_gen_sources ${output})
73	@@ -320,21 +320,21 @@ macro(gen_template tmpl output)
74	OUTPUT ${output}
75	DEPENDS ${xml_files} ${py_files} ${h_files} ${tmpl}
76	COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
77	- ${CMAKE_SOURCE_DIR}/gen/volk_tmpl_utils.py
78	+ ${PROJECT_SOURCE_DIR}/gen/volk_tmpl_utils.py
79	--input ${tmpl} --output ${output} ${ARGN}
80	)
81	endmacro(gen_template)
82
83	-make_directory(${CMAKE_BINARY_DIR}/include/volk)
84	+make_directory(${PROJECT_BINARY_DIR}/include/volk)
85
86	-gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk.tmpl.h ${CMAKE_BINARY_DIR}/include/volk/volk.h)
87	-gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk.tmpl.c ${CMAKE_BINARY_DIR}/lib/volk.c)
88	-gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_typedefs.tmpl.h ${CMAKE_BINARY_DIR}/include/volk/volk_typedefs.h)
89	-gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_cpu.tmpl.h ${CMAKE_BINARY_DIR}/include/volk/volk_cpu.h)
90	-gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_cpu.tmpl.c ${CMAKE_BINARY_DIR}/lib/volk_cpu.c)
91	-gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_config_fixed.tmpl.h ${CMAKE_BINARY_DIR}/include/volk/volk_config_fixed.h)
92	-gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_machines.tmpl.h ${CMAKE_BINARY_DIR}/lib/volk_machines.h)
93	-gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_machines.tmpl.c ${CMAKE_BINARY_DIR}/lib/volk_machines.c)
94	+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk.tmpl.h ${PROJECT_BINARY_DIR}/include/volk/volk.h)
95	+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk.tmpl.c ${PROJECT_BINARY_DIR}/lib/volk.c)
96	+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_typedefs.tmpl.h ${PROJECT_BINARY_DIR}/include/volk/volk_typedefs.h)
97	+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_cpu.tmpl.h ${PROJECT_BINARY_DIR}/include/volk/volk_cpu.h)
98	+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_cpu.tmpl.c ${PROJECT_BINARY_DIR}/lib/volk_cpu.c)
99	+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_config_fixed.tmpl.h ${PROJECT_BINARY_DIR}/include/volk/volk_config_fixed.h)
100	+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_machines.tmpl.h ${PROJECT_BINARY_DIR}/lib/volk_machines.h)
101	+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_machines.tmpl.c ${PROJECT_BINARY_DIR}/lib/volk_machines.c)
102
103	set(BASE_CFLAGS NONE)
104	string(TOUPPER ${CMAKE_BUILD_TYPE} CBTU)
105	@@ -362,12 +362,12 @@ set(COMPILER_INFO "${CMAKE_C_COMPILER}::
106	foreach(machine_name ${available_machines})
107	#generate machine source
108	set(machine_source ${CMAKE_CURRENT_BINARY_DIR}/volk_machine_${machine_name}.c)
109	- gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_machine_xxx.tmpl.c ${machine_source} ${machine_name})
110	+ gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_machine_xxx.tmpl.c ${machine_source} ${machine_name})
111
112	#determine machine flags
113	execute_process(
114	COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
115	- ${CMAKE_SOURCE_DIR}/gen/volk_compile_utils.py
116	+ ${PROJECT_SOURCE_DIR}/gen/volk_compile_utils.py
117	--mode "machine_flags" --machine "${machine_name}" --compiler "${COMPILER_NAME}"
118	OUTPUT_VARIABLE ${machine_name}_flags OUTPUT_STRIP_TRAILING_WHITESPACE
119	)
120	@@ -393,9 +393,9 @@ string(REPLACE "\n" " \\n" COMPILER_INFO
121	# Set local include directories first
122	########################################################################
123	include_directories(
124	- ${CMAKE_BINARY_DIR}/include
125	- ${CMAKE_SOURCE_DIR}/include
126	- ${CMAKE_SOURCE_DIR}/kernels
127	+ ${PROJECT_BINARY_DIR}/include
128	+ ${PROJECT_SOURCE_DIR}/include
129	+ ${PROJECT_SOURCE_DIR}/kernels
130	${CMAKE_CURRENT_BINARY_DIR}
131	${CMAKE_CURRENT_SOURCE_DIR}
132	)
133	@@ -420,8 +420,8 @@ if(${CMAKE_VERSION} VERSION_GREATER "2.8
134	# setup architecture specific assembler flags
135	set(ARCH_ASM_FLAGS "-mfpu=neon -g")
136	# then add the files
137	- include_directories(${CMAKE_SOURCE_DIR}/kernels/volk/asm/neon)
138	- file(GLOB asm_files ${CMAKE_SOURCE_DIR}/kernels/volk/asm/neon/*.s)
139	+ include_directories(${PROJECT_SOURCE_DIR}/kernels/volk/asm/neon)
140	+ file(GLOB asm_files ${PROJECT_SOURCE_DIR}/kernels/volk/asm/neon/*.s)
141	foreach(asm_file ${asm_files})
142	list(APPEND volk_sources ${asm_file})
143	message(STATUS "Adding source file: ${asm_file}")
144	@@ -453,7 +453,7 @@ if(ORC_FOUND)
145	list(APPEND volk_libraries ${ORC_LIBRARIES})
146
147	#setup orc functions
148	- file(GLOB orc_files ${CMAKE_SOURCE_DIR}/kernels/volk/asm/orc/*.orc)
149	+ file(GLOB orc_files ${PROJECT_SOURCE_DIR}/kernels/volk/asm/orc/*.orc)
150	foreach(orc_file ${orc_files})
151
152	#extract the name for the generated c source from the orc file
153	@@ -511,7 +511,7 @@ PROPERTIES COMPILE_DEFINITIONS "${machin
154
155	if(MSVC)
156	#add compatibility includes for stdint types
157	- include_directories(${CMAKE_SOURCE_DIR}/cmake/msvc)
158	+ include_directories(${PROJECT_SOURCE_DIR}/cmake/msvc)
159	add_definitions(-DHAVE_CONFIG_H)
160	#compile the sources as C++ due to the lack of complex.h under MSVC
161	set_source_files_properties(${volk_sources} PROPERTIES LANGUAGE CXX)
162	diff -up gnuradio-3.7.9.1/volk/python/volk_modtool/CMakeLists.txt.cmake35 gnuradio-3.7.9.1/volk/python/volk_modtool/CMakeLists.txt

Removed Link Here

(-)a/devel/cmake/files/patch-git_9d653f9c (-59 lines)
1	Fixes a crash in CMake itself when configuring x11-toolkits/fltk-devel with
2	CMake 3.4.0.
3
4	commit 9d653f9c1cc129be4fdce7f0e93c282760c7603e
5	Author: Stephen Kelly <steveire@gmail.com>
6	Date: Sat Aug 29 18:05:46 2015 +0200
7
8	cmFLTKWrapUI: Remove CMake 2.2 compat code.
9
10	CMake 3.0 dropped CMake <= 2.4 compatibility.
11
12	--- Source/cmFLTKWrapUICommand.cxx
13	+++ Source/cmFLTKWrapUICommand.cxx
14	@@ -129,45 +129,6 @@ void cmFLTKWrapUICommand::FinalPass()
15	cmSystemTools::Message(msg.c_str(),"Warning");
16	return;
17	}
18	- std::vector<cmSourceFile*> srcs;
19	- target->GetSourceFiles(srcs, "");
20	- bool found = false;
21	- for (unsigned int i = 0; i < srcs.size(); ++i)
22	- {
23	- if (srcs[i]->GetFullPath() ==
24	- this->GeneratedSourcesClasses[0]->GetFullPath())
25	- {
26	- found = true;
27	- break;
28	- }
29	- }
30	- if (!found)
31	- {
32	- std::string msg =
33	- "In CMake 2.2 the FLTK_WRAP_UI command sets a variable to the list of "
34	- "source files that should be added to your executable or library. It "
35	- "appears that you have not added these source files to your target. "
36	- "You should change your CMakeLists.txt file to "
37	- "directly add the generated files to the target. "
38	- "For example FTLK_WRAP_UI(foo src1 src2 src3) "
39	- "will create a variable named foo_FLTK_UI_SRCS that contains the list "
40	- "of sources to add to your target when you call ADD_LIBRARY or "
41	- "ADD_EXECUTABLE. For now CMake will add the sources to your target "
42	- "for you as was done in CMake 2.0 and earlier. In the future this may "
43	- "become an error.";
44	- msg +="The problem was found while processing the source directory: ";
45	- msg += this->Makefile->GetCurrentSourceDirectory();
46	- cmSystemTools::Message(msg.c_str(),"Warning");
47	- // first we add the rules for all the .fl to .h and .cxx files
48	- size_t lastHeadersClass = this->GeneratedSourcesClasses.size();
49	-
50	- // Generate code for all the .fl files
51	- for(size_t classNum = 0; classNum < lastHeadersClass; classNum++)
52	- {
53	- this->Makefile->GetTargets()[this->Target]
54	- .AddSource(this->GeneratedSourcesClasses[classNum]->GetFullPath());
55	- }
56	- }
57	}
58
59

Lines 39-44 share/aclocal/cmake.m4 Link Here

(-)b/devel/cmake/pkg-plist (-1 / +7 lines)
39	%%DATADIR%%/Help/command/build_name.rst	39	%%DATADIR%%/Help/command/build_name.rst
40	%%DATADIR%%/Help/command/cmake_host_system_information.rst	40	%%DATADIR%%/Help/command/cmake_host_system_information.rst
41	%%DATADIR%%/Help/command/cmake_minimum_required.rst	41	%%DATADIR%%/Help/command/cmake_minimum_required.rst
		42	%%DATADIR%%/Help/command/cmake_parse_arguments.rst
42	%%DATADIR%%/Help/command/cmake_policy.rst	43	%%DATADIR%%/Help/command/cmake_policy.rst
43	%%DATADIR%%/Help/command/configure_file.rst	44	%%DATADIR%%/Help/command/configure_file.rst
44	%%DATADIR%%/Help/command/continue.rst	45	%%DATADIR%%/Help/command/continue.rst
Lines 296-305 share/aclocal/cmake.m4 Link Here
296	%%DATADIR%%/Help/module/FindHTMLHelp.rst	297	%%DATADIR%%/Help/module/FindHTMLHelp.rst
297	%%DATADIR%%/Help/module/FindHg.rst	298	%%DATADIR%%/Help/module/FindHg.rst
298	%%DATADIR%%/Help/module/FindITK.rst	299	%%DATADIR%%/Help/module/FindITK.rst
299	%%DATADIR%%/Help/module/FindIntl.rst
300	%%DATADIR%%/Help/module/FindIce.rst	300	%%DATADIR%%/Help/module/FindIce.rst
301	%%DATADIR%%/Help/module/FindIcotool.rst	301	%%DATADIR%%/Help/module/FindIcotool.rst
302	%%DATADIR%%/Help/module/FindImageMagick.rst	302	%%DATADIR%%/Help/module/FindImageMagick.rst
		303	%%DATADIR%%/Help/module/FindIntl.rst
303	%%DATADIR%%/Help/module/FindJNI.rst	304	%%DATADIR%%/Help/module/FindJNI.rst
304	%%DATADIR%%/Help/module/FindJPEG.rst	305	%%DATADIR%%/Help/module/FindJPEG.rst
305	%%DATADIR%%/Help/module/FindJasper.rst	306	%%DATADIR%%/Help/module/FindJasper.rst
Lines 370-375 share/aclocal/cmake.m4 Link Here
370	%%DATADIR%%/Help/module/FindX11.rst	371	%%DATADIR%%/Help/module/FindX11.rst
371	%%DATADIR%%/Help/module/FindXCTest.rst	372	%%DATADIR%%/Help/module/FindXCTest.rst
372	%%DATADIR%%/Help/module/FindXMLRPC.rst	373	%%DATADIR%%/Help/module/FindXMLRPC.rst
		374	%%DATADIR%%/Help/module/FindXalanC.rst
373	%%DATADIR%%/Help/module/FindXercesC.rst	375	%%DATADIR%%/Help/module/FindXercesC.rst
374	%%DATADIR%%/Help/module/FindZLIB.rst	376	%%DATADIR%%/Help/module/FindZLIB.rst
375	%%DATADIR%%/Help/module/Findosg.rst	377	%%DATADIR%%/Help/module/Findosg.rst
Lines 706-711 share/aclocal/cmake.m4 Link Here
706	%%DATADIR%%/Help/prop_tgt/INTERFACE_SYSTEM_INCLUDE_DIRECTORIES.rst	708	%%DATADIR%%/Help/prop_tgt/INTERFACE_SYSTEM_INCLUDE_DIRECTORIES.rst
707	%%DATADIR%%/Help/prop_tgt/INTERPROCEDURAL_OPTIMIZATION.rst	709	%%DATADIR%%/Help/prop_tgt/INTERPROCEDURAL_OPTIMIZATION.rst
708	%%DATADIR%%/Help/prop_tgt/INTERPROCEDURAL_OPTIMIZATION_CONFIG.rst	710	%%DATADIR%%/Help/prop_tgt/INTERPROCEDURAL_OPTIMIZATION_CONFIG.rst
		711	%%DATADIR%%/Help/prop_tgt/IOS_INSTALL_COMBINED.rst
709	%%DATADIR%%/Help/prop_tgt/JOB_POOL_COMPILE.rst	712	%%DATADIR%%/Help/prop_tgt/JOB_POOL_COMPILE.rst
710	%%DATADIR%%/Help/prop_tgt/JOB_POOL_LINK.rst	713	%%DATADIR%%/Help/prop_tgt/JOB_POOL_LINK.rst
711	%%DATADIR%%/Help/prop_tgt/LABELS.rst	714	%%DATADIR%%/Help/prop_tgt/LABELS.rst
Lines 802-807 share/aclocal/cmake.m4 Link Here
802	%%DATADIR%%/Help/release/3.2.rst	805	%%DATADIR%%/Help/release/3.2.rst
803	%%DATADIR%%/Help/release/3.3.rst	806	%%DATADIR%%/Help/release/3.3.rst
804	%%DATADIR%%/Help/release/3.4.rst	807	%%DATADIR%%/Help/release/3.4.rst
		808	%%DATADIR%%/Help/release/3.5.rst
805	%%DATADIR%%/Help/release/dev.txt	809	%%DATADIR%%/Help/release/dev.txt
806	%%DATADIR%%/Help/release/index.rst	810	%%DATADIR%%/Help/release/index.rst
807	%%DATADIR%%/Help/variable/APPLE.rst	811	%%DATADIR%%/Help/variable/APPLE.rst
Lines 884-889 share/aclocal/cmake.m4 Link Here
884	%%DATADIR%%/Help/variable/CMAKE_EXECUTABLE_SUFFIX.rst	888	%%DATADIR%%/Help/variable/CMAKE_EXECUTABLE_SUFFIX.rst
885	%%DATADIR%%/Help/variable/CMAKE_EXE_LINKER_FLAGS.rst	889	%%DATADIR%%/Help/variable/CMAKE_EXE_LINKER_FLAGS.rst
886	%%DATADIR%%/Help/variable/CMAKE_EXE_LINKER_FLAGS_CONFIG.rst	890	%%DATADIR%%/Help/variable/CMAKE_EXE_LINKER_FLAGS_CONFIG.rst
		891	%%DATADIR%%/Help/variable/CMAKE_EXPORT_COMPILE_COMMANDS.rst
887	%%DATADIR%%/Help/variable/CMAKE_EXPORT_NO_PACKAGE_REGISTRY.rst	892	%%DATADIR%%/Help/variable/CMAKE_EXPORT_NO_PACKAGE_REGISTRY.rst
888	%%DATADIR%%/Help/variable/CMAKE_EXTRA_GENERATOR.rst	893	%%DATADIR%%/Help/variable/CMAKE_EXTRA_GENERATOR.rst
889	%%DATADIR%%/Help/variable/CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES.rst	894	%%DATADIR%%/Help/variable/CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES.rst
Lines 935-940 share/aclocal/cmake.m4 Link Here
935	%%DATADIR%%/Help/variable/CMAKE_INSTALL_RPATH.rst	940	%%DATADIR%%/Help/variable/CMAKE_INSTALL_RPATH.rst
936	%%DATADIR%%/Help/variable/CMAKE_INSTALL_RPATH_USE_LINK_PATH.rst	941	%%DATADIR%%/Help/variable/CMAKE_INSTALL_RPATH_USE_LINK_PATH.rst
937	%%DATADIR%%/Help/variable/CMAKE_INTERNAL_PLATFORM_ABI.rst	942	%%DATADIR%%/Help/variable/CMAKE_INTERNAL_PLATFORM_ABI.rst
		943	%%DATADIR%%/Help/variable/CMAKE_IOS_INSTALL_COMBINED.rst
938	%%DATADIR%%/Help/variable/CMAKE_JOB_POOL_COMPILE.rst	944	%%DATADIR%%/Help/variable/CMAKE_JOB_POOL_COMPILE.rst
939	%%DATADIR%%/Help/variable/CMAKE_JOB_POOL_LINK.rst	945	%%DATADIR%%/Help/variable/CMAKE_JOB_POOL_LINK.rst
940	%%DATADIR%%/Help/variable/CMAKE_LANG_ARCHIVE_APPEND.rst	946	%%DATADIR%%/Help/variable/CMAKE_LANG_ARCHIVE_APPEND.rst

Added Link Here

(-)b/devel/kdevplatform/files/patch-plugins_filetemplates_CMakeLists.txt (+14 lines)
1	Make sure the dependency exists, as testfiletemplates depends on ui files
2	generated by kdevfiletemplates.
3
4	Submitted upstream: https://phabricator.kde.org/D1160
5	--- plugins/filetemplates/CMakeLists.txt.orig 2016-03-17 11:59:47 UTC
6	+++ plugins/filetemplates/CMakeLists.txt
7	@@ -81,6 +81,7 @@ main.cpp
8	)
9
10	kde4_add_executable(testfiletemplates ${test_srcs})
11	+add_dependencies(testfiletemplates kdevfiletemplates)
12
13	target_link_libraries(testfiletemplates
14	${KDE4_KDECORE_LIBS}

Lines 1-6 Link Here

(-)b/emulators/aqemu/files/patch-CMakeLists.txt (-3 / +15 lines)
1	--- ./CMakeLists.txt.orig 2010-12-21 19:45:24.000000000 +0300	1	The libvncclient target was removed because it was not used anywhere (aqemu
2	+++ ./CMakeLists.txt 2011-04-17 13:03:32.608958928 +0400	2	links against the systems libvncclient.so, only the definitions and includes
3	@@ -318,6 +318,6 @@	3	are needed from this block) and did not declare its dependency on the moc and
		4	ui files, possibly causing problems in parallel builds.
		5	--- CMakeLists.txt.orig 2011-01-14 19:38:53 UTC
		6	+++ CMakeLists.txt
		7	@@ -164,7 +164,6 @@ IF( NOT WITHOUT_EMBEDDED_DISPLAY )
		8	Embedded_Display/vncclientthread.cpp Embedded_Display/vncview.cpp )
		9
		10	ADD_DEFINITIONS( -DVNC_DISPLAY -DQTONLY )
		11	- ADD_LIBRARY( libvncclient SHARED ${aqemu_headers} ${aqemu_sources} )
		12
		13	INCLUDE_DIRECTORIES( ${VNCCLIENT_INCLUDE_DIRS} ${LIBVNCCLIENT_INCLUDE_DIR} )
		14	ENDIF( NOT WITHOUT_EMBEDDED_DISPLAY )
		15	@@ -318,6 +317,6 @@ IF( INSTALL_MAN )
4	MESSAGE( STATUS "MAN_PAGE_COMPRESSOR flag not set. Available values: gzip, bzip2, lzma" )	16	MESSAGE( STATUS "MAN_PAGE_COMPRESSOR flag not set. Available values: gzip, bzip2, lzma" )
5	MESSAGE( STATUS "Will be installed not compressed MAN pages" )	17	MESSAGE( STATUS "Will be installed not compressed MAN pages" )
6		18

Added Link Here

(-)b/games/vavoom/files/patch-source_CMakeLists.txt (+20 lines)
1	--- source/CMakeLists.txt.orig 2016-03-16 16:43:57 UTC
2	+++ source/CMakeLists.txt
3	@@ -790,7 +790,7 @@ if (MAIN_COMPILE_FLAGS)
4	set_target_properties(vavoom PROPERTIES COMPILE_FLAGS ${MAIN_COMPILE_FLAGS})
5	endif (MAIN_COMPILE_FLAGS)
6	target_link_libraries(vavoom ${MAIN_LIBS})
7	-add_dependencies(vavoom core timidity glbsp libglvis)
8	+add_dependencies(vavoom core timidity glbsp libglvis revision_check)
9
10	install(TARGETS vavoom DESTINATION ${BINDIR})
11
12	@@ -845,7 +845,7 @@ else(ENABLE_WRAPPERS)
13	endif(ENABLE_WRAPPERS)
14	set_target_properties(vavoom-dedicated PROPERTIES COMPILE_FLAGS -DSERVER)
15	target_link_libraries(vavoom-dedicated glbsp core ${ZLIB_LIBRARY} ${NET_LIBRARIES})
16	-add_dependencies(vavoom-dedicated core glbsp)
17	+add_dependencies(vavoom-dedicated core glbsp revision_check)
18
19	install(TARGETS vavoom-dedicated DESTINATION ${BINDIR})
20

Added Link Here

(-)b/net-im/telepathy-qt4/files/patch-git_7389dc9 (+19 lines)
1	This commit is required to avoid occasional build failures in parallel builds.
2
3	From 7389dc990c67d4269f3a79c924c054e87f2e4ac5 Mon Sep 17 00:00:00 2001
4	From: Alexandr Akulich <akulichalexander@gmail.com>
5	Date: Fri, 15 Jan 2016 18:54:09 +0500
6	Subject: CMakeLists: Added missing service dependence.
7
8	telepathy-qt-service depends on generated stable and future types and consts.
9
10	--- TelepathyQt/CMakeLists.txt
11	+++ TelepathyQt/CMakeLists.txt
12	@@ -953,6 +953,7 @@ if(ENABLE_SERVICE_SUPPORT)
13	#endif (ENABLE_COMPILER_COVERAGE)
14	# lets build a static only library until we have a stable API/ABI
15	add_library(telepathy-qt${QT_VERSION_MAJOR}-service STATIC ${telepathy_qt_service_SRCS})
16	+ add_dependencies(telepathy-qt${QT_VERSION_MAJOR}-service stable-typesgen future-typesgen)
17
18	# generate service moc files
19	foreach(moc_src ${telepathy_qt_service_MOC_SRCS})

Added Link Here

(-)b/science/orthanc/files/patch-Resources_CMake_DcmtkConfiguration.cmake (+22 lines)
1	Fix the build with CMake 3.5.0.
2
3	FindDCMTK.cmake was rewritten upstream, and is incompatible with the uses in
4	this file: we need to set DCMTK_DIR in the port's Makefile, and it does not
5	match the directory used for searching for the headers below.
6	--- Resources/CMake/DcmtkConfiguration.cmake.orig 2015-12-15 16:49:02 UTC
7	+++ Resources/CMake/DcmtkConfiguration.cmake
8	@@ -186,10 +186,10 @@ else()
9	-DHAVE_CONFIG_H=1
10	)
11
12	- if (EXISTS "${DCMTK_DIR}/config/cfunix.h")
13	- set(DCMTK_CONFIGURATION_FILE "${DCMTK_DIR}/config/cfunix.h")
14	- elseif (EXISTS "${DCMTK_DIR}/config/osconfig.h") # This is for Arch Linux
15	- set(DCMTK_CONFIGURATION_FILE "${DCMTK_DIR}/config/osconfig.h")
16	+ if (EXISTS "${DCMTK_config_INCLUDE_DIR}/cfunix.h")
17	+ set(DCMTK_CONFIGURATION_FILE "${DCMTK_config_INCLUDE_DIR}/cfunix.h")
18	+ elseif (EXISTS "${DCMTK_config_INCLUDE_DIR}/osconfig.h") # This is for Arch Linux
19	+ set(DCMTK_CONFIGURATION_FILE "${DCMTK_config_INCLUDE_DIR}/osconfig.h")
20	else()
21	message(FATAL_ERROR "Please install libdcmtk*-dev")
22	endif()